Skip to content
This repository was archived by the owner on Jun 25, 2024. It is now read-only.

Commit 589f3d6

Browse files
author
Billy Clark
committed
announcements weren't being tested
1 parent 17eb5ab commit 589f3d6

File tree

11 files changed

+202
-1
lines changed

11 files changed

+202
-1
lines changed

‎README.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,17 @@ content of that announcement. HTML is supported.
8181
12. Login as an idp2 user, e.g., username=distant_future & password=a
8282
13. Click **Logout**
8383

84+
### Announcements
85+
1. Goto [http://ssp-hub2.local:8081](http://ssp-hub2.local:8081)
86+
2. The announcement should be displayed
87+
3. Login as hub2 administrator, e.g., username=admin & password=abc123
88+
4. Click **Authentication** tab
89+
5. Click **Test configured authentication sources**
90+
6. Click **hub-discovery**
91+
7. The announcement should be displayed
92+
8. Click **Login with idp3**
93+
9. The announcement should be displayed
94+
8495
### Expiry
8596

8697
#### About to expire

‎development/hub2/authsources.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
$config = [
3+
'admin' => [
4+
'core:AdminPassword',
5+
],
6+
'hub-discovery' => [
7+
'saml:SP',
8+
'entityID' => 'ssp-hub2.local',
9+
'discoURL' => 'http://ssp-hub2.local:8081/module.php/sildisco/disco.php',
10+
],
11+
];

‎development/hub2/saml20-idp-hosted.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?php
2+
$metadata['ssp-hub2.local'] = [
3+
'host' => 'ssp-hub2.local',
4+
'auth' => 'hub-discovery',
5+
];

‎development/hub2/saml20-idp-remote.php‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<?php
2+
$metadata['http://ssp-hub-idp3.local:8087'] = [
3+
'enabled' => true,
4+
'metadata-set' => 'saml20-idp-remote',
5+
'entityid' => 'http://ssp-hub-idp3.local:8087',
6+
'name' => [
7+
'en' => 'IdP 3'
8+
],
9+
'SingleSignOnService' => 'http://ssp-hub-idp3.local:8087/saml2/idp/SSOService.php',
10+
'SingleLogoutService' => 'http://ssp-hub-idp3.local:8087/saml2/idp/SingleLogoutService.php',
11+
'certData' => 'MIIDzzCCAregAwIBAgIJAPlZYTAQSIbHMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOQzEPMA0GA1UEBwwGV2F4aGF3MQwwCgYDVQQKDANTSUwxDTALBgNVBAsMBEdUSVMxDjAMBgNVBAMMBVN0ZXZlMSQwIgYJKoZIhvcNAQkBFhVzdGV2ZV9iYWd3ZWxsQHNpbC5vcmcwHhcNMTYxMDE3MTIzMTQ1WhcNMjYxMDE3MTIzMTQ1WjB+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCTkMxDzANBgNVBAcMBldheGhhdzEMMAoGA1UECgwDU0lMMQ0wCwYDVQQLDARHVElTMQ4wDAYDVQQDDAVTdGV2ZTEkMCIGCSqGSIb3DQEJARYVc3RldmVfYmFnd2VsbEBzaWwub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArssOaeKbdOQFpN6bBolwSJ/6QFBXA73Sotg60anx9v6aYdUTmi+b7SVtvOmHDgsD5X8pN/6Z11QCZfTYg2nW3ZevGZsj8W/R6C8lRLHzWUr7e7DXKfj8GKZptHlUs68kn0ndNVt9r/+irJe9KBdZ+4kAihykomNdeZg06bvkklxVcvpkOfLTQzEqJAmISPPIeOXes6hXORdqLuRNTuIKarcZ9rstLnpgAs2TE4XDOrSuUg3XFnM05eDpFQpUb0RXWcD16mLCPWw+CPrGoCfoftD5ZGfll+W2wZ7d0kQ4TbCpNyxQH35q65RPVyVNPgSNSsFFkmdcqP9DsFqjJ8YC6wIDAQABo1AwTjAdBgNVHQ4EFgQUD6oyJKOPPhvLQpDCC3027QcuQwUwHwYDVR0jBBgwFoAUD6oyJKOPPhvLQpDCC3027QcuQwUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAA6tCLHJQGfXGdFerQ3J0wUu8YDSLb0WJqPtGdIuyeiywR5ooJf8G/jjYMPgZArepLQSSi6t8/cjEdkYWejGnjMG323drQ9M1sKMUhOJF4po9R3t7IyvGAL3fSqjXA8JXH5MuGuGtChWxaqhduA0dBJhFAtAXQ61IuIQF7vSFxhTwCvJnaWdWD49sG5OqjCfgIQdY/mw70e45rLnR/bpfoigL67sTJxy+Kx2ogbvMR6lITByOEQFMt7BYpMtXrwvKUM7k9NOo1jREmJacC8PTx//jRhCWwzUj1RsfIri24BuITrawwqMsYl8DZiiwMpjUf9m4NPaf4E7+QRpzo+MCcg==',
12+
];
13+
$metadata['jaars-idp'] = [
14+
'enabled' => true,
15+
'metadata-set' => 'saml20-idp-remote',
16+
'entityid' => 'jaars-idp',
17+
'name' => [
18+
'en' => 'jaars'
19+
],
20+
'logoURL' => 'https://static.gtis.guru/idp-logo/jaars-logo.png'
21+
];
22+
$metadata['sil-idp'] = [
23+
'enabled' => true,
24+
'metadata-set' => 'saml20-idp-remote',
25+
'entityid' => 'sil-idp',
26+
'name' => [
27+
'en' => 'sil'
28+
],
29+
'logoURL' => 'https://static.gtis.guru/idp-logo/sil-logo.png'
30+
];
31+
$metadata['usa-idp'] = [
32+
'enabled' => true,
33+
'metadata-set' => 'saml20-idp-remote',
34+
'entityid' => 'usa-idp',
35+
'name' => [
36+
'en' => 'usa'
37+
],
38+
'logoURL' => 'https://static.gtis.guru/idp-logo/usa-logo.png'
39+
];
40+
$metadata['wga-idp'] = [
41+
'enabled' => true,
42+
'metadata-set' => 'saml20-idp-remote',
43+
'entityid' => 'wga-idp',
44+
'name' => [
45+
'en' => 'wga'
46+
],
47+
'logoURL' => 'https://static.gtis.guru/idp-logo/wga-logo.png'
48+
];
49+
$metadata['mock-jaars-idp'] = [
50+
'enabled' => false,
51+
'metadata-set' => 'saml20-idp-remote',
52+
'entityid' => 'mock-jaars-idp',
53+
'name' => [
54+
'en' => 'jaars'
55+
],
56+
'logoURL' => 'https://static.gtis.guru/idp-logo/jaars-logo.png'
57+
];
58+
$metadata['mock-sil-idp'] = [
59+
'enabled' => false,
60+
'metadata-set' => 'saml20-idp-remote',
61+
'entityid' => 'mock-sil-idp',
62+
'name' => [
63+
'en' => 'sil'
64+
],
65+
'logoURL' => 'https://static.gtis.guru/idp-logo/sil-logo.png'
66+
];
67+
$metadata['mock-usa-idp'] = [
68+
'enabled' => false,
69+
'metadata-set' => 'saml20-idp-remote',
70+
'entityid' => 'mock-usa-idp',
71+
'name' => [
72+
'en' => 'usa'
73+
],
74+
'logoURL' => 'https://static.gtis.guru/idp-logo/usa-logo.png'
75+
];
76+
$metadata['mock-wga-idp'] = [
77+
'enabled' => false,
78+
'metadata-set' => 'saml20-idp-remote',
79+
'entityid' => 'mock-wga-idp',
80+
'name' => [
81+
'en' => 'wga'
82+
],
83+
'logoURL' => 'https://static.gtis.guru/idp-logo/wga-logo.png'
84+
];

‎development/idp3/announcement.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?php
2+
$citation = '<a href="http://www.lipsum.com" target="_blank">lipsum.com</a>';
3+
4+
return "On the other hand, we denounce with righteous indignation and dislike men who are so beguiled and demoralized by the charms of pleasure of the moment, so blinded by desire, that they cannot foresee the pain and trouble that are bound to ensue; and equal blame belongs to those who fail in their duty through weakness of will, which is the same as saying through shrinking from toil and pain. These cases are perfectly simple and easy to distinguish. In a free hour, when our power of choice is untrammelled and when nothing prevents our being able to do what we like best, every pleasure is to be welcomed and every pain avoided. But in certain circumstances and owing to the claims of duty or the obligations of business it will frequently occur that pleasures have to be repudiated and annoyances accepted. The wise man therefore always holds in these matters to this principle of selection: he rejects pleasures to secure other greater pleasures, or else he endures pains to avoid worse pains. More info at $citation";

‎development/idp3/authsources.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?php
2+
$config = [
3+
'admin' => [
4+
'core:AdminPassword',
5+
],
6+
];

‎development/idp3/cert/ssp-hub-idp3.pem‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCuyw5p4pt05AWk
3+
3psGiXBIn/pAUFcDvdKi2DrRqfH2/pph1ROaL5vtJW286YcOCwPlfyk3/pnXVAJl
4+
9NiDadbdl68ZmyPxb9HoLyVEsfNZSvt7sNcp+PwYpmm0eVSzrySfSd01W32v/6Ks
5+
l70oF1n7iQCKHKSiY115mDTpu+SSXFVy+mQ58tNDMSokCYhI88h45d6zqFc5F2ou
6+
5E1O4gpqtxn2uy0uemACzZMThcM6tK5SDdcWczTl4OkVClRvRFdZwPXqYsI9bD4I
7+
+sagJ+h+0PlkZ+WX5bbBnt3SRDhNsKk3LFAffmrrlE9XJU0+BI1KwUWSZ1yo/0Ow
8+
WqMnxgLrAgMBAAECggEBAJkLtIAj6WgM66AzRVwQ5R7B7JV5gucEwzTQzZedDP7u
9+
aPC2Z+Z+PzICrrZVZ2p1XKEKmWWs6LjwlvT80MMn3fnCgY+TFoKlHQ8GkMQ4Z9HM
10+
ZKwl6A+ZMerHcxCRmAeImDFctHKuvDtpQt+KMRa0c5ZZm/5SHBkPld4M1m+9k+JN
11+
wheR6xVd82R04cLyJNKPdjuZnVLlNaUn44g4PX/BHVbYXISiORIT/apsOWfwkzLJ
12+
ZBSTZBTRjNN/U+yzqQ+UlyKrABJiLF6INSSmLEfSnVh0EyoMc249k0D9JSbm0tZR
13+
gn0U5Gdr+hEUdNn7I2INRwROvGiptasgj76HZQsj3QkCgYEA0+2BQeovteYZj8zf
14+
nq0gT5UhoFFVvKK0sKONk3LFBoFEJ5HtcmA+Oi/IkHPXDaMHdXNkGw6Rilwhjt9z
15+
7vXia9P8+/Ent5p+kqzCFvYd5UfDz1NMEb5jrrjLpQtPgA5+mUhURyL9chQHeIMO
16+
ZyckyJGap0kcbaV/+HkZOx/0q68CgYEA0ySZ/PzKqgnZNhjQTgvR7xuvQPuSvakB
17+
KJoqHoThN1v3WciFzoXi9aU4idkYKe5vupXUu8scqvUMfpTvaazye9IPrjuxebo1
18+
hzhkRwMfMZ7k480zhOQt4YyYZSTkZIflAiP/fP2pel/KPDemuA/QPjR5begeAL5P
19+
pfGkOZmTf4UCgYEAk4ClDGmg12vVsr6XjetVp85WXyz9DZP5S1Aqg8vH0iU6eIga
20+
yhauePU1FUVrErS7xkWQETzsk25YdQaVvGYrN32OgRRx3lqLai8Pz8dxO1ndsXl6
21+
Yocu/jbklnTu2mQ8PReYgQKbgEDsijY9WhJmiaq+B1zdins8PIacxwgQ1UUCgYEA
22+
rgnJdCLa2nXruQ+TBAHyNWlYd/Pl7LdV4SXR+f4Fth/0Lul+gdESVvCtPdLYfBex
23+
uNav12uAYdpDRkN1ZGHOLgnkKvXBQFkgrijpXy9PkxMqECugf7Wlq/i71QMnz0XE
24+
mpMZkOl1vQ0gIaqtnaJLQDr4rINb17kG5f3cJC5WyhECgYAejIBSfk4ty9SRwbBM
25+
GQaCuQMmWxh1mIi2XBWpUna5Si719QOPNIqI3oAZQf1eE9jTFHZwB3IlbdrJ9HAf
26+
yszwVJTPbMBA/Q8uNyElcLku0wtY3fskSCgw5UQshO+6zzL2Wo0O2ftIxc7+hdf0
27+
8reJ9MfI2kYx3cdR7//py10Wtw==
28+
-----END PRIVATE KEY-----

‎development/idp3/saml20-idp-hosted.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?php
2+
$metadata['http://ssp-hub-idp3.local:8087'] = [
3+
'host' => '__DEFAULT__',
4+
'privatekey' => 'ssp-hub-idp3.pem',
5+
'auth' => 'admin',
6+
];

‎development/idp3/saml20-sp-remote.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?php
2+
$metadata['ssp-hub2.local'] = [
3+
'AssertionConsumerService' => 'http://ssp-hub2.local:8081/module.php/saml/sp/saml2-acs.php/hub-discovery',
4+
'SingleLogoutService' => 'http://ssp-hub2.local:8081/module.php/saml/sp/saml2-logout.php/hub-discovery',
5+
];

‎docker-compose.yml‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ services:
33
hub:
44
image: silintl/ssp-base:develop
55
volumes:
6-
- ./development/hub/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
76
- ./development/hub/authsources.php:/data/vendor/simplesamlphp/simplesamlphp/config/authsources.php
87
- ./development/hub/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php
98
- ./development/hub/saml20-idp-hosted.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-hosted.php
@@ -62,3 +61,44 @@ services:
6261
IDP_NAME: "Idp 2"
6362
ANALYTICS_ID: "UA-XXXX-Y"
6463
CHANGE_PWD_URL: "http://example.org"
64+
hub2:
65+
image: silintl/ssp-base:develop
66+
volumes:
67+
- ./development/hub2/authsources.php:/data/vendor/simplesamlphp/simplesamlphp/config/authsources.php
68+
- ./development/hub2/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php
69+
- ./development/hub2/saml20-idp-hosted.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-hosted.php
70+
- ./www/default-logo.png:/data/vendor/simplesamlphp/simplesamlphp/www/logo.png
71+
- ./:/data/vendor/simplesamlphp/simplesamlphp/modules/material
72+
- ./development/idp3/announcement.php:/data/vendor/simplesamlphp/simplesamlphp/announcement/announcement.php
73+
ports:
74+
- '8081:80'
75+
environment:
76+
ADMIN_PASS: "abc123"
77+
SECURE_COOKIE: "false"
78+
SHOW_SAML_ERRORS: "true"
79+
THEME_USE: "material:material"
80+
HUB_MODE: "true"
81+
ADMIN_EMAIL: "[email protected]"
82+
SECRET_SALT: "QthhmKnsmC7X/+2bv3CgzBWaFR68J3fP6QgmZhM1L7M="
83+
IDP_NAME: "The Hub2"
84+
idp3:
85+
image: silintl/ssp-base:develop
86+
volumes:
87+
- ./development/idp3/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
88+
- ./development/idp3/authsources.php:/data/vendor/simplesamlphp/simplesamlphp/config/authsources.php
89+
- ./development/idp3/saml20-idp-hosted.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-hosted.php
90+
- ./development/idp3/saml20-sp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-sp-remote.php
91+
- ./www/default-logo.png:/data/vendor/simplesamlphp/simplesamlphp/www/logo.png
92+
- ./:/data/vendor/simplesamlphp/simplesamlphp/modules/material
93+
- ./development/idp3/announcement.php:/data/vendor/simplesamlphp/simplesamlphp/announcement/announcement.php
94+
ports:
95+
- '8087:80'
96+
environment:
97+
ADMIN_PASS: "a"
98+
SECURE_COOKIE: "false"
99+
SHOW_SAML_ERRORS: "true"
100+
ADMIN_PROTECT_INDEX_PAGE: "false"
101+
THEME_USE: "material:material"
102+
ADMIN_EMAIL: "[email protected]"
103+
SECRET_SALT: "xbcCMIHHzsgE8yYC6OIBjsp+ruZYghHn1k5Bv/IGbrg="
104+
IDP_NAME: "Idp 3"

0 commit comments

Comments
 (0)