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

Commit 3d4e09f

Browse files
brisktbriskt
authored
Merge pull request #66 from silinternational/develop
Release 7.0.0
2 parents d207f9a + 42acc4a commit 3d4e09f

Some content is hidden

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

44 files changed

+714
-301
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ errors:
1313

1414
clean:
1515
docker-compose kill
16-
docker system prune -f
16+
docker-compose rm -f

‎README.md‎

Lines changed: 68 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -60,119 +60,89 @@ If provided, an alert will be shown to the user filled with the content of that
6060

6161
### Setup
6262

63-
1. Setup `localhost` (or `192.168.62.54`, if using Vagrant) aliases for `ssp-hub.local`, `ssp-hub2.local`, `ssp-idp1.local`, `ssp-idp2.local`, `ssp-idp3.local`, `ssp-idp4.local` and `ssp-sp.local`. This is typically done in `/etc/hosts`.
63+
1. Setup `localhost` (or `192.168.62.54`, if using Vagrant) aliases for `ssp-hub1.local`, `ssp-hub2.local`, `ssp-idp1.local`, `ssp-idp2.local`, `ssp-idp3.local`, `ssp-idp4.local`, `ssp-sp1.local` and `ssp-sp2.local`. This is typically done in `/etc/hosts`. _Example line: `0.0.0.0 ssp-hub1.local ssp-idp1.local ssp-idp2.local ssp-idp4.local ssp-hub2.local ssp-idp3.local ssp-sp1.local ssp-sp2.local`_
6464
1. Start test environment, i.e., `make` from the command line.
6565

6666
### Hub page
6767

68-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
69-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
70-
1. Click **Authentication** tab
71-
1. Click **Test configured authentication sources**
72-
1. Click **hub-discovery**
68+
1. Goto [Hub 1](http://ssp-hub1.local/module.php/core/authenticate.php?as=hub-discovery)
7369

7470
### Error page
7571

76-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
77-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
72+
1. Goto [Hub 1](http://ssp-hub1.local)
7873
1. Click **Federation** tab
7974
1. Click either **Show metadata** link
75+
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
8076

8177
### Logout page
8278

83-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
84-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
79+
1. Goto [Hub 1](http://ssp-hub1.local)
8580
1. Click **Authentication** tab
8681
1. Click **Test configured authentication sources**
8782
1. Click **admin**
83+
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
8884
1. Click **Logout**
8985

9086
### Login page
9187

92-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
93-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
94-
1. Click **Authentication** tab
95-
1. Click **Test configured authentication sources**
96-
1. Click **hub-discovery**
97-
1. Click **idp1**
98-
1. NOTE: login page should NOT have material design
99-
1. Login as idp1 administrator: `username=`**admin** `password=`**a**
100-
1. Click **Logout**
101-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
102-
1. Click **Authentication** tab
103-
1. Click **Test configured authentication sources**
104-
1. Click **hub-discovery**
105-
1. Click **idp2**
106-
1. NOTE: login page should have material design
107-
1. Login as an idp2 user: `username=`**distant_future** `password=`**a**
108-
1. Click **Logout**
88+
#### Without theme in place
89+
90+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
91+
1. Click **idp1** (first one)
92+
1. login page should **NOT** have material design
93+
94+
#### With theme in place
95+
96+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
97+
1. Click **idp2** (second one)
98+
1. login page **SHOULD** have material design
10999

110100
### Forgot password functionality
111101

112-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
113-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
114-
1. Click **Authentication** tab
115-
1. Click **Test configured authentication sources**
116-
1. Click **hub-discovery**
117-
1. Click **idp2**
102+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
103+
1. Click **idp2** (second one)
118104
1. Forgot password link should be visible
119105

120106
### Expiry functionality
121107

122108
#### About to expire page
123109

124-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
125-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
126-
1. Click **Authentication** tab
127-
1. Click **Test configured authentication sources**
128-
1. Click **hub-discovery**
129-
1. Click **idp2**
110+
_Note: This nag only works once since choosing later will simply set the nag date into the future a little._
111+
112+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
113+
1. Click **idp2** (second one)
130114
1. Login as an "about to expire" user: `username=`**near_future** `password=`**a**
131115
1. Click **Later**
132116
1. Click **Logout**
133117

134118
#### Expired page
135119

136-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
137-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
138-
1. Click **Authentication** tab
139-
1. Click **Test configured authentication sources**
140-
1. Click **hub-discovery**
141-
1. Click **idp2**
120+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
121+
1. Click **idp2** (second one)
142122
1. Login as an "expired" user: `username=`**already_past** `password=`**a**
143123

144124
### Multi-factor authentication (MFA) functionality
145125

146126
#### Nag about missing MFA setup
147127

148-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
149-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
150-
1. Click **Authentication** tab
151-
1. Click **Test configured authentication sources**
152-
1. Click **hub-discovery**
153-
1. Click **idp4**
128+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
129+
1. Click **idp4** (third one)
154130
1. Login as an "unprotected" user: `username=`**nag_for_mfa** `password=`**a**
155-
1. The "learn more" link should be visible if configured via env var `MFA_LEARN_MORE_URL`.
131+
1. The "learn more" link should be visible
132+
1. Click **Remind me later**
133+
1. Click **Logout**
156134

157135
#### Force MFA setup
158136

159-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
160-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
161-
1. Click **Authentication** tab
162-
1. Click **Test configured authentication sources**
163-
1. Click **hub-discovery**
164-
1. Click **idp4**
137+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
138+
1. Click **idp4** (third one)
165139
1. Login as an "unsafe" user: `username=`**must_set_up_mfa** `password=`**a**
166-
1. The "learn more" link should be visible if configured via env var `MFA_LEARN_MORE_URL`.
140+
1. The "learn more" link should be visible
167141

168142
#### Backup code
169143

170-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
171-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
172-
1. Click **Authentication** tab
173-
1. Click **Test configured authentication sources**
174-
1. Click **hub-discovery**
175-
1. Click **idp4**
144+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
145+
1. Click **idp4** (third one)
176146
1. Login as a "backup code" user: `username=`**has_backupcode** `password=`**a**
177147
1. Enter one of the following codes to verify (`94923279, 82743523, 77802769, 01970541, 37771076`)
178148
1. Click **Logout**
@@ -181,57 +151,61 @@ If provided, an alert will be shown to the user filled with the content of that
181151

182152
#### TOTP code
183153

184-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
185-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
186-
1. Click **Authentication** tab
187-
1. Click **Test configured authentication sources**
188-
1. Click **hub-discovery**
189-
1. Click **idp4**
154+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
155+
1. Click **idp4** (third one)
190156
1. Login as a "totp" user: `username=`**has_totp** `password=`**a**
191-
1. Set up an app using this secret, `GFDHSMZ6EVBFGRB4` **OR** `QR Code (paste in browser) data:image/png;base64,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`
157+
1. Set up an app using this secret, `JVRXKYTMPBEVKXLS`
192158
1. Enter code from app to verify
193159
1. Click **Logout**
194160

195161
#### Key (U2F)
196162

197-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
198-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
199-
1. Click **Authentication** tab
200-
1. Click **Test configured authentication sources**
201-
1. Click **hub-discovery**
202-
1. Click **idp4**
163+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
164+
1. Click **idp4** (third one)
203165
1. Login as a "u2f" user: `username=`**has_u2f** `password=`**a**
204166
1. Insert key and press
205167
1. Click **Logout**
206168

207169
#### Multiple options
208170

209-
1. Goto [http://ssp-hub.local](http://ssp-hub.local)
210-
1. Login as hub administrator: `username=`**admin** `password=`**abc123**
211-
1. Click **Authentication** tab
212-
1. Click **Test configured authentication sources**
213-
1. Click **hub-discovery**
214-
1. Click **idp4**
171+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
172+
1. Click **idp4** (third one)
173+
1. Login as a "multiple option" user: `username=`**has_all** `password=`**a**
174+
1. Click **MORE OPTIONS**
175+
176+
#### Manager rescue
177+
178+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
179+
1. Click **idp4** (third one)
215180
1. Login as a "multiple option" user: `username=`**has_all** `password=`**a**
216181
1. Click **MORE OPTIONS**
182+
1. Click the help option
183+
1. Choose **Send**
184+
185+
_NOTE: At this time, the correct code is not known and can't be tested locally (it's only available in an email to the manager)_
217186

218187
### Announcements functionality
219188

220-
1. Goto [http://ssp-hub2.local:8081](http://ssp-hub2.local:8081)
221-
1. The announcement should be displayed
222-
1. Login as hub2 administrator: `username=`**admin** `password=`**abc123**
223-
1. Click **Authentication** tab
224-
1. Click **Test configured authentication sources**
225-
1. Click **hub-discovery**
226-
1. The announcement should be displayed
227-
1. Click **idp3**
228-
1. The announcement should be displayed
189+
1. Goto [SP 2](http://ssp-sp2.local:8083/module.php/core/authenticate.php?as=hub-discovery)
190+
1. The announcement should be displayed on the hub
191+
1. Click **idp3** (first one)
192+
1. The announcement should be displayed at the login screen
229193

230194
### SP name functionality
231195

232-
1. Goto [http://ssp-sp.local:8082/module.php/core/authenticate.php?as=hub-discovery](http://ssp-sp.local:8082/module.php/core/authenticate.php?as=hub-discovery)
196+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
233197
1. The sp name should appear in the banner
234198

199+
### Profile review functionality
200+
1. Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
201+
1. Click **idp4** (third one)
202+
1. Login as a "Review needed" user: `username=`**needs_review** `password=`**a**
203+
1. Enter one of the following printable codes to verify (`94923279, 82743523, 77802769, 01970541, 37771076`)
204+
1. Click the button to update the profile
205+
1. Click the button to continue
206+
1. Click **Logout**
207+
208+
235209
## i18n support
236210

237211
Translations are categorized by page in definition files located in the `dictionaries` directory.

development/idp1/cert/ssp-idp1.pem renamed to development/cert/saml.pem

File renamed without changes.

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

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎development/hub/sp-remote.php‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎development/hub1/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-hub1.local',
9+
'discoURL' => 'http://ssp-hub1.local/module.php/sildisco/disco.php',
10+
],
11+
];

‎development/hub1/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['ssp-hub1.local'] = [
3+
'host' => 'ssp-hub1.local',
4+
'auth' => 'hub-discovery',
5+
'privatekey' => 'saml.pem',
6+
];

0 commit comments

Comments
 (0)