Skip to content

Commit 6e0d25d

Browse files
mrvanesmrvanes
authored
Merge branch 'master' into patch-1
2 parents eecaf95 + 07feff1 commit 6e0d25d

File tree

95 files changed

+22091
-10751
lines changed

Some content is hidden

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

95 files changed

+22091
-10751
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ sign.key
2121
_site
2222
profile.out*
2323
localconfig.py
24+
*.sqlite

‎examples/big.xrd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Link rel="urn:oasis:names:tc:SAML:2.0:metadata" href="https://wayf.aco.net/aconet-metadata.xml"/>
55
</XRD>
66
<XRD>
7-
<Link rel="urn:oasis:names:tc:SAML:2.0:metadata" href="https://ds.aaf.edu.au/distribution/metadata/metadata.aaf.signed.complete.xml"/>
7+
<Link rel="urn:oasis:names:tc:SAML:2.0:metadata" href="https://md.aaf.edu.au/aaf-metadata.xml"/>
88
</XRD>
99
<XRD>
1010
<Link rel="urn:oasis:names:tc:SAML:2.0:metadata" href="http://metadata.aai.switch.ch/metadata.switchaai.xml"/>

‎examples/links.xrd‎

Lines changed: 33 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,43 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<XRDS xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
33
<XRD>
4-
<Subject>https://md.swamid.se/md/swamid-2.0.xml</Subject>
5-
<Link rel="urn:oasis:names:tc:SAML:2.0:metadata" href="https://md.swamid.se/md/swamid-2.0.xml">
4+
<Subject>https://mds.swamid.se/md/swamid-2.0.xml</Subject>
5+
<Link rel="urn:oasis:names:tc:SAML:2.0:metadata" href="https://mds.swamid.se/md/swamid-2.0.xml">
66
<Title>SWAMID</Title>
77
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
88
<ds:X509Data>
99
<ds:X509Certificate>
10-
MIIDdTCCAl0CBEY7EskwDQYJKoZIhvcNAQEEBQAwfzELMAkGA1UEBhMCU0UxEjAQ
11-
BgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMREwDwYDVQQKEwhT
12-
V0FNSS5zZTEPMA0GA1UECxMGU1dBTUlEMSQwIgYDVQQDExtTV0FNSUQgbWV0YWRh
13-
dGEgc2lnbmVyIHYxLjEwHhcNMDcwNTA0MTEwMjMzWhcNMTcwNTAxMTEwMjMzWjB/
14-
MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9j
15-
a2hvbG0xETAPBgNVBAoTCFNXQU1JLnNlMQ8wDQYDVQQLEwZTV0FNSUQxJDAiBgNV
16-
BAMTG1NXQU1JRCBtZXRhZGF0YSBzaWduZXIgdjEuMTCCASIwDQYJKoZIhvcNAQEB
17-
BQADggEPADCCAQoCggEBAM6wXN3pVCo98SACS6JCHjSlWj83oNL/Ct+a9hmAx1NZ
18-
SKg7lnEJYwWBvzJt5o/47jRQbGm94a45Yy5LVoXq4XyCKINhMxSwbRROvr8Hw6tg
19-
P1Z9dk5Jjejvus3gyaH3+EuEyP4aIjTlgmHDwW6HOv/m/4bOXSHB4Pisn7aocqU7
20-
kjpOn1f0cGodWOgGO4tP7KXs6ndcLhIkW+e/B80WEr0kocuc/pvx+aLuKSkttk/A
21-
fP1DFs5sqX31RXQKGrB/uEEYVv1Qvneig+RXGSbqk2Tab3BcLE/Cjnfi9Q9cH/jR
22-
eL/YSSafGtl+EBgXKszxjMtELhiEWsL9RrMu1HUkBusCAwEAATANBgkqhkiG9w0B
23-
AQQFAAOCAQEAkXaa61gp/lkEDNRFc0bzH3ZyoUFgol64F1zdAwBS3xnsCkTnAXt3
24-
p452daEyz+0UR5J/BruMOyvR57w1m7ckVnx/sAgRgaD6gQlUWehjKPEsx8o5iDfO
25-
5R1V5Rn2o7+0VuIJDDObEAtMwqn2Nk6TTzsUVfz5y9nUQAxBz3EqXnnSgRwqSwRF
26-
yiVkpVfwtUHIolAf6O2N9Fg1jqoqt4mQCOyRZpD0/5SRYESTY6TJjTmvoh+zOPlI
27-
yEiw+Zrl/FWjXtBnRnz8AVT5NRzYiMHdbTHs0Fh6elsb5b9gTBo7j6+t36m7oo2K
28-
DaWWpMWvuWHugEqvIAXDCI/HzTbbiWm9NQ==
10+
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
2941
</ds:X509Certificate>
3042
</ds:X509Data>
3143
</ds:KeyInfo>
@@ -62,43 +74,4 @@ GzP/3TaZPzMlKPDCjp0XOQfyQqFIXdwjPFTWjEusDBlm4qJAlQ==
6274
</ds:KeyInfo>
6375
</Link>
6476
</XRD -->
65-
<!-- XRD>
66-
<Subject>Skolfederation</Subject>
67-
<Link rel="urn:oasis:names:tc:SAML:2.0:metadata" href="http://meta01.skolfederation.se/skolfederation-2_0.xml">
68-
<Title>Skolfederation Metadata</Title>
69-
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
70-
<ds:X509Data>
71-
<ds:X509Certificate>
72-
MIIE+DCCAuACCQDz68MlqYKzETANBgkqhkiG9w0BAQUFADA+MQswCQYDVQQGEwJT
73-
RTEhMB8GA1UEAxMYbWV0YTAxLnNrb2xmZWRlcmF0aW9uLnNlMQwwCgYDVQQKEwNJ
74-
SVMwHhcNMTMwNDAzMTMxMDQ3WhcNMjMwNDAxMTMxMDQ3WjA+MQswCQYDVQQGEwJT
75-
RTEhMB8GA1UEAxMYbWV0YTAxLnNrb2xmZWRlcmF0aW9uLnNlMQwwCgYDVQQKEwNJ
76-
SVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDTugaeIk5XZlnMWBpj
77-
rJZRvwm2YItd4Hbx285//LL9k2HjYhLnWwfdjv0yZSCuw49E47FdhT5j3rnQJayQ
78-
ifKffn6M2jMnDZh9MYx8SjT/CMFid5TXVS5jFcEtfzYfSl9Fv8rqFAjJTDDroneT
79-
dnMVRlcW03XVDG1ryOou3W1pCrRRsHe+HHkpP3H4cL9pSaXgR9ptAadTHfzEFFnX
80-
qVwvSJD1SMK7+OvFUDQCnoKYEdyNpFfsouwtessXtq4jTOZdzjTxeLIrVnfFpVPf
81-
F2xN8298x3fCDeoUPjQKDNYYwNq5N4U7RnsM+KYjTQ8rLelOyP5hsy/wETtUJ5vR
82-
OAa6WQyxPmqFJnwTALPhDhUyw4CvOHiQahlPSxouXZdBQt5pt/nu3VJ33DhF6POw
83-
aJUetzl6TY4bNNp2tIQQhcqBCTHDfLBnMR3VyrUMcYWZ6qNGp+4Lhjl2KRNn9VF7
84-
a5+TVzTFd63pLXrXY1KvUcJQFk8Su/BsrJrPKg8z6WvC+h5vXAF1dwkx3oz96VTp
85-
9xIwbVMGxSfx30AKWTR+V7XpoqNWtXTbtJKcxRXto2ZWI9FAmnr/a1j0knAn1v/x
86-
3Lqt6krJihCt5YLxq7oft6XzWw/i+rrSdmeXIZi8qV1Moo/2yCNxVpi4TyBH2Qo5
87-
xG2krTe4lWAI/+PcKvzYgEVP5wIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCBqZbH
88-
u7DnFWiBa1pSYijGfTpws1HASiHxQc5h8UHDxqVwakLftdIn9IH6flRPEwQceNHF
89-
59G3wdn10QcDCURprMkVN+6XAhOIKmFz4UA6d87lR+qDasKZSMetX79l9mMWiMWl
90-
dX7yyy/Q8pYhZrwQySzTRV+IP7bviyfUVSTirUy4bYgS3e3KDVGi3d+kZjh70OL+
91-
bPAJEVmLfoFjWuaeOHxRvdNw4f2Zd5XczhiU5tHv+Fnx+tO1bNhE6ySq5JzYiTrJ
92-
58psZPp43uOAWZnchFZ9fGuzHkS7QgeJjeLnF2y+gCYTLYeLw0mEA2cprzOSBu2P
93-
4eEV2nr2vU8SX8aE4/XfE7UISzW2Q5zbpsImGCZEZG1gVO9cha1oSwkg4x+a0xBB
94-
rQRvEDN8AzzwHdDTH6CXcMnNSK6fDyUlw7BrAhrVYX/pF1ppD4hhxLw0VPYO71DT
95-
Fxcmr0p11ZHG18Jilfthhe+/7JWgRv4kuSjFlKy8B3RcUVz9hP5h1ARxtZRDBZNy
96-
Y3YP/wCNH8WPZb6iUk1evwV/2qYLnE5FT8V/LvbEo5oNFi9oynMK3m/uHbWTQTAm
97-
K0AZ2JBDFxho9PJlXqTZhCEXdtz1CU0gj3W8GRYoN/xlrCFDpCTXlChrKRQKf2fn
98-
eb/5QMtDmtGlRI0wxYt7B/Wfaal9/KMRTnYkoA==
99-
</ds:X509Certificate>
100-
</ds:X509Data>
101-
</ds:KeyInfo>
102-
</Link>
103-
</XRD -->
10477
</XRDS>

‎examples/load.fd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- load:
22
- https://wayf.aco.net/aconet-metadata.xml
3-
- https://ds.aaf.edu.au/distribution/metadata/metadata.aaf.signed.complete.xml
3+
- https://md.aaf.edu.au/aaf-metadata.xml
44
- http://metadata.aai.switch.ch/metadata.switchaai.xml
55
- http://www.carsi.edu.cn/carsimetadata/carsifed-metadata.xml
66
- https://www.aai.dfn.de/fileadmin/metadata/DFN-AAI-metadata.xml

‎examples/met.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- "http://mds.edugain.org/"
44
- "http://metadata.aai.switch.ch/metadata.switchaai.xml"
55
- "http://eduid.at/md/aconet-registered.xml"
6-
- "https://ds.aaf.edu.au/distribution/metadata/metadata.aaf.signed.complete.xml"
6+
- "https://md.aaf.edu.au/aaf-metadata.xml"
77
- "https://ds.cafe.rnp.br/metadata/cafe-metadata.xml"
88
- "http://www.carsi.edu.cn/carsimetadata/carsifed-metadata.xml"
99
- "https://www.aai.dfn.de/fileadmin/metadata/DFN-AAI-metadata.xml"

‎requirements.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@ iso8601
1313
requests
1414
simplejson
1515
jinja2
16-
pyconfig
16+
pyconfig
17+
pyyaml
18+
multiprocess
19+
requests_cache
20+
requests_file

‎setup.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@
2929
'redis',
3030
'futures',
3131
'requests',
32-
'pyconfig'
32+
'requests_cache',
33+
'requests_file',
34+
'pyconfig',
35+
'pyyaml',
36+
'multiprocess'
3337
]
3438

3539
python_implementation_str = python_implementation()

0 commit comments

Comments
 (0)