Skip to content

Commit 816dcc7

Browse files
rhoerberhoerbe
committed
Conflicts: src/saml2/attributemaps/saml_uri.py
2 parents 2f4f2d6 + 33db77a commit 816dcc7

Some content is hidden

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

46 files changed

+734
-738
lines changed

‎LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2013 Roland Hedberg. All rights reserved.
1+
Copyright 2014 Roland Hedberg. 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:

‎doc/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# General information about the project.
4141
project = u'pysaml2'
42-
copyright = u'2010-2011, Roland Hedberg'
42+
copyright = u'2014, Roland Hedberg'
4343

4444
# The version info for the project you're documenting, acts as replacement for
4545
# |version| and |release|, also used in various other places throughout the

‎example/idp2/idp.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
logger = logging.getLogger("saml2.idp")
5252
logger.setLevel(logging.WARNING)
5353

54+
5455
class Cache(object):
5556
def __init__(self):
5657
self.user2uid = {}
@@ -879,6 +880,7 @@ def metadata(environ, start_response):
879880
logger.error("An error occured while creating metadata:" + ex.message)
880881
return not_found(environ, start_response)
881882

883+
882884
def staticfile(environ, start_response):
883885
try:
884886
path = args.path
@@ -893,6 +895,7 @@ def staticfile(environ, start_response):
893895
logger.error("An error occured while creating metadata:" + ex.message)
894896
return not_found(environ, start_response)
895897

898+
896899
def application(environ, start_response):
897900
"""
898901
The main WSGI application. Dispatch the current request to

‎example/idp2/templates/root.mako‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<%def name="post()" filter="trim">
1717
<div>
1818
<div class="footer">
19-
<p>&#169; Copyright 2011 Ume&#229; Universitet &nbsp;</p>
19+
<p>&#169; Copyright 2014 Ume&#229; Universitet &nbsp;</p>
2020
</div>
2121
</div>
2222
</%def>

‎example/idp2_repoze/templates/root.mako‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<%def name="post()" filter="trim">
1717
<div>
1818
<div class="footer">
19-
<p>&#169; Copyright 2011 Ume&#229; Universitet &nbsp;</p>
19+
<p>&#169; Copyright 2014 Ume&#229; Universitet &nbsp;</p>
2020
</div>
2121
</div>
2222
</%def>

‎example/sp-wsgi/sp.xml‎

Lines changed: 33 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,34 @@
11
<?xml version='1.0' encoding='UTF-8'?>
2-
<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"
3-
xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"
4-
xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion"
5-
xmlns:ns4="http://www.w3.org/2000/09/xmldsig#"
6-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7-
entityID="http://localhost:8087/sp.xml">
8-
<ns0:Extensions>
9-
<ns1:EntityAttributes>
10-
<ns2:Attribute Name="http://macedir.org/entity-category">
11-
<ns2:AttributeValue xsi:type="xs:string">
12-
http://www.geant.net/uri/dataprotection-code-of-conduct/v1
13-
</ns2:AttributeValue>
14-
</ns2:Attribute>
15-
</ns1:EntityAttributes>
16-
</ns0:Extensions>
17-
<ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"
18-
protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
19-
<ns0:KeyDescriptor use="encryption">
20-
<ns4:KeyInfo>
21-
<ns4:X509Data>
22-
<ns4:X509Certificate>
23-
MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
24-
BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
25-
EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
26-
MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l
27-
YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw
28-
DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7
29-
bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC
30-
FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR
31-
mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW
32-
BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9
33-
o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW
34-
BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE
35-
AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
36-
BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO
37-
zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
38-
+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
39-
</ns4:X509Certificate>
40-
</ns4:X509Data>
41-
</ns4:KeyInfo>
42-
</ns0:KeyDescriptor>
43-
<ns0:KeyDescriptor use="signing">
44-
<ns4:KeyInfo>
45-
<ns4:X509Data>
46-
<ns4:X509Certificate>
47-
MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
48-
BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
49-
EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
50-
MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l
51-
YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw
52-
DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7
53-
bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC
54-
FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR
55-
mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW
56-
BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9
57-
o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW
58-
BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE
59-
AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
60-
BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO
61-
zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
62-
+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
63-
</ns4:X509Certificate>
64-
</ns4:X509Data>
65-
</ns4:KeyInfo>
66-
</ns0:KeyDescriptor>
67-
<ns0:AssertionConsumerService
68-
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
69-
Location="http://localhost:8087/acs/redirect" index="1"/>
70-
<ns0:AssertionConsumerService
71-
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
72-
Location="http://localhost:8087/acs/post" index="2"/>
73-
<ns0:AttributeConsumingService index="1">
74-
<ns0:ServiceName xml:lang="en">My SP service</ns0:ServiceName>
75-
<ns0:ServiceDescription xml:lang="en">Example SP
76-
</ns0:ServiceDescription>
77-
<ns0:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4"
78-
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
79-
isRequired="true"/>
80-
<ns0:RequestedAttribute FriendlyName="givenname"
81-
Name="urn:oid:2.5.4.42"
82-
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
83-
isRequired="true"/>
84-
<ns0:RequestedAttribute FriendlyName="edupersonaffiliation"
85-
Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"
86-
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
87-
isRequired="true"/>
88-
<ns0:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12"
89-
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
90-
isRequired="false"/>
91-
</ns0:AttributeConsumingService>
92-
</ns0:SPSSODescriptor>
93-
</ns0:EntityDescriptor>
2+
<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="http://localhost:8087/sp.xml"><ns0:Extensions><ns1:EntityAttributes><ns2:Attribute Name="http://macedir.org/entity-category"><ns2:AttributeValue xsi:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</ns2:AttributeValue></ns2:Attribute></ns1:EntityAttributes></ns0:Extensions><ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><ns0:KeyDescriptor use="encryption"><ns4:KeyInfo><ns4:X509Data><ns4:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
3+
BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
4+
EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
5+
MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l
6+
YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw
7+
DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7
8+
bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC
9+
FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR
10+
mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW
11+
BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9
12+
o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW
13+
BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE
14+
AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
15+
BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO
16+
zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
17+
+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
18+
</ns4:X509Certificate></ns4:X509Data></ns4:KeyInfo></ns0:KeyDescriptor><ns0:KeyDescriptor use="signing"><ns4:KeyInfo><ns4:X509Data><ns4:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
19+
BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
20+
EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
21+
MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l
22+
YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw
23+
DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7
24+
bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC
25+
FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR
26+
mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW
27+
BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9
28+
o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW
29+
BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE
30+
AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
31+
BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO
32+
zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
33+
+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
34+
</ns4:X509Certificate></ns4:X509Data></ns4:KeyInfo></ns0:KeyDescriptor><ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://localhost:8087/acs/redirect" index="1" /><ns0:AttributeConsumingService index="1"><ns0:ServiceName xml:lang="en">My SP service</ns0:ServiceName><ns0:ServiceDescription xml:lang="en">Example SP</ns0:ServiceDescription><ns0:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /><ns0:RequestedAttribute FriendlyName="givenname" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /><ns0:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /><ns0:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false" /></ns0:AttributeConsumingService></ns0:SPSSODescriptor></ns0:EntityDescriptor>

‎setup.py‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,10 @@
11
#!/usr/bin/env python
2-
#
3-
# Copyright (C) 2007 SIOS Technology, Inc.
4-
# Copyright (C) 2011 Umea Universitet, Sweden
5-
#
6-
# Licensed under the Apache License, Version 2.0 (the "License");
7-
# you may not use this file except in compliance with the License.
8-
# You may obtain a copy of the License at
9-
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
12-
# Unless required by applicable law or agreed to in writing, software
13-
# distributed under the License is distributed on an "AS IS" BASIS,
14-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
# See the License for the specific language governing permissions and
16-
# limitations under the License.
17-
#
18-
#
2+
193
import sys
204

215
from setuptools import setup
226
from setuptools.command.test import test as TestCommand
237

24-
258
class PyTest(TestCommand):
269

2710
def finalize_options(self):
@@ -84,7 +67,9 @@ def run_tests(self):
8467
package_data={'': ['xml/*.xml']},
8568
classifiers=["Development Status :: 4 - Beta",
8669
"License :: OSI Approved :: Apache Software License",
87-
"Topic :: Software Development :: Libraries :: Python Modules"],
70+
"Topic :: Software Development :: Libraries :: Python Modules",
71+
"Programming Language :: Python :: 2.6",
72+
"Programming Language :: Python :: 2.7"],
8873

8974
scripts=["tools/parse_xsd2.py", "tools/make_metadata.py",
9075
"tools/mdexport.py", "tools/merge_metadata.py"],

‎src/s2repoze/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
# -*- coding: utf-8 -*-
22
# Created by Roland Hedberg
3-
# Copyright (c) 2009 Umeå Universitet. All rights reserved.

‎src/s2repoze/plugins/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
# -*- coding: utf-8 -*-
2-
# Created by Roland Hedberg
3-
# Copyright (c) 2009 Umeå Universitet. All rights reserved.

‎src/s2repoze/plugins/sp.py‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
1-
# Copyright (C) 2009 Umea University
21
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
152
"""
163
A plugin that allows you to use SAML2 SSO as authentication
174
and SAML2 attribute aggregations as metadata collector in your

0 commit comments

Comments
 (0)