Skip to content

Commit a714765

Browse files
author
Roland Hedberg
committed
Merge branch 'master' of https://github.com/rhoerbe/saml2test
Conflicts: INSTALL LICENSE.txt README.rst doc/Makefile doc/conf.py doc/index.rst doc/install.rst doc/make.bat doc/make.sh setup.py tests/attributemaps/basic.py tests/attributemaps/saml_uri.py tests/attributemaps/shibboleth_uri.py
2 parents c04ba65 + 3c3ed2f commit a714765

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+7502
-289
lines changed

‎LICENSE.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2014 Roland Hedberg. All rights reserved.
1+
Copyright 2013 Geant. All rights reserved.
22

33
Redistribution and use in source and binary forms, with or without modification, are
44
permitted provided that the following conditions are met:
@@ -10,12 +10,16 @@ permitted provided that the following conditions are met:
1010
of conditions and the following disclaimer in the documentation and/or other materials
1111
provided with the distribution.
1212

13-
THIS SOFTWARE IS PROVIDED BY ROLAND HEDBERG ``AS IS'' AND ANY EXPRESS OR IMPLIED
13+
THIS SOFTWARE IS PROVIDED BY GEANT ``AS IS'' AND ANY EXPRESS OR IMPLIED
1414
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
15-
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ROLAND HEDBERG OR
15+
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GEANT OR
1616
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
1717
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
1818
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
1919
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
2020
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
2121
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22+
23+
The views and conclusions contained in the software and documentation are those of the
24+
authors and should not be interpreted as representing official policies, either expressed
25+
or implied, of Geant.

‎README.rst

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
2-
*************************
3-
PySAML2 - SAML2 in Python
4-
*************************
1+
***********************************************************
2+
SAML2test - A tool for testing SAML2 and profile compliance
3+
***********************************************************
54

65
:Author: Roland Hedberg
7-
:Version: 1.0.0
8-
9-
PySAML2 is a pure python implementation of SAML2. It contains all
10-
necessary pieces for building a SAML2 service provider or an identity provider.
11-
The distribution contains examples of both.
12-
Originally written to work in a WSGI environment there are extensions that
13-
allow you to use it with other frameworks.
14-
15-
6+
:Version: 0.3.0
167

8+
SAML2test is a tests tool that will allow an independent validation
9+
of a specific instance of a SAML2 entity. It will test not only if the
10+
instance works according to the SAML2 standard but also if it complies
11+
with a specific profile of SAML2.

‎doc/Makefile

Lines changed: 100 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,84 +5,149 @@
55
SPHINXOPTS =
66
SPHINXBUILD = sphinx-build
77
PAPER =
8+
BUILDDIR = _build
89

910
# Internal variables.
1011
PAPEROPT_a4 = -D latex_paper_size=a4
1112
PAPEROPT_letter = -D latex_paper_size=letter
12-
ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
13+
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
14+
# the i18n builder cannot share the environment and doctrees with the others
15+
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
1316

14-
.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
17+
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
1518

1619
help:
1720
@echo "Please use \`make <target>' where <target> is one of"
18-
@echo " html to make standalone HTML files"
19-
@echo " dirhtml to make HTML files named index.html in directories"
20-
@echo " pickle to make pickle files"
21-
@echo " json to make JSON files"
22-
@echo " htmlhelp to make HTML files and a HTML help project"
23-
@echo " qthelp to make HTML files and a qthelp project"
24-
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
25-
@echo " changes to make an overview of all changed/added/deprecated items"
26-
@echo " linkcheck to check all external links for integrity"
27-
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
21+
@echo " html to make standalone HTML files"
22+
@echo " dirhtml to make HTML files named index.html in directories"
23+
@echo " singlehtml to make a single large HTML file"
24+
@echo " pickle to make pickle files"
25+
@echo " json to make JSON files"
26+
@echo " htmlhelp to make HTML files and a HTML help project"
27+
@echo " qthelp to make HTML files and a qthelp project"
28+
@echo " devhelp to make HTML files and a Devhelp project"
29+
@echo " epub to make an epub"
30+
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
31+
@echo " latexpdf to make LaTeX files and run them through pdflatex"
32+
@echo " text to make text files"
33+
@echo " man to make manual pages"
34+
@echo " texinfo to make Texinfo files"
35+
@echo " info to make Texinfo files and run them through makeinfo"
36+
@echo " gettext to make PO message catalogs"
37+
@echo " changes to make an overview of all changed/added/deprecated items"
38+
@echo " linkcheck to check all external links for integrity"
39+
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
2840

2941
clean:
30-
-rm -rf _build/*
42+
-rm -rf $(BUILDDIR)/*
3143

3244
html:
33-
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
45+
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
3446
@echo
35-
@echo "Build finished. The HTML pages are in _build/html."
47+
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
3648

3749
dirhtml:
38-
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml
50+
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
3951
@echo
40-
@echo "Build finished. The HTML pages are in _build/dirhtml."
52+
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
53+
54+
singlehtml:
55+
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
56+
@echo
57+
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
4158

4259
pickle:
43-
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle
60+
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
4461
@echo
4562
@echo "Build finished; now you can process the pickle files."
4663

4764
json:
48-
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) _build/json
65+
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
4966
@echo
5067
@echo "Build finished; now you can process the JSON files."
5168

5269
htmlhelp:
53-
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
70+
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
5471
@echo
5572
@echo "Build finished; now you can run HTML Help Workshop with the" \
56-
".hhp project file in _build/htmlhelp."
73+
".hhp project file in $(BUILDDIR)/htmlhelp."
5774

5875
qthelp:
59-
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) _build/qthelp
76+
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
6077
@echo
6178
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
62-
".qhcp project file in _build/qthelp, like this:"
63-
@echo "# qcollectiongenerator _build/qthelp/pysaml2.qhcp"
79+
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
80+
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SAML2test.qhcp"
81+
@echo "To view the help file:"
82+
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SAML2test.qhc"
83+
84+
devhelp:
85+
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
86+
@echo
87+
@echo "Build finished."
6488
@echo "To view the help file:"
65-
@echo "# assistant -collectionFile _build/qthelp/pysaml2.qhc"
89+
@echo "# mkdir -p $$HOME/.local/share/devhelp/SAML2test"
90+
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SAML2test"
91+
@echo "# devhelp"
92+
93+
epub:
94+
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
95+
@echo
96+
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
6697

6798
latex:
68-
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex
99+
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
100+
@echo
101+
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
102+
@echo "Run \`make' in that directory to run these through (pdf)latex" \
103+
"(use \`make latexpdf' here to do that automatically)."
104+
105+
latexpdf:
106+
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
107+
@echo "Running LaTeX files through pdflatex..."
108+
$(MAKE) -C $(BUILDDIR)/latex all-pdf
109+
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
110+
111+
text:
112+
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
113+
@echo
114+
@echo "Build finished. The text files are in $(BUILDDIR)/text."
115+
116+
man:
117+
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
118+
@echo
119+
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
120+
121+
texinfo:
122+
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
123+
@echo
124+
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
125+
@echo "Run \`make' in that directory to run these through makeinfo" \
126+
"(use \`make info' here to do that automatically)."
127+
128+
info:
129+
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
130+
@echo "Running Texinfo files through makeinfo..."
131+
make -C $(BUILDDIR)/texinfo info
132+
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
133+
134+
gettext:
135+
$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
69136
@echo
70-
@echo "Build finished; the LaTeX files are in _build/latex."
71-
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
72-
"run these through (pdf)latex."
137+
@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
73138

74139
changes:
75-
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) _build/changes
140+
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
76141
@echo
77-
@echo "The overview file is in _build/changes."
142+
@echo "The overview file is in $(BUILDDIR)/changes."
78143

79144
linkcheck:
80-
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck
145+
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
81146
@echo
82147
@echo "Link check complete; look for any errors in the above output " \
83-
"or in _build/linkcheck/output.txt."
148+
"or in $(BUILDDIR)/linkcheck/output.txt."
84149

85150
doctest:
86-
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) _build/doctest
151+
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
87152
@echo "Testing of doctests in the sources finished, look at the " \
88-
"results in _build/doctest/output.txt."
153+
"results in $(BUILDDIR)/doctest/output.txt."

0 commit comments

Comments
 (0)