Skip to content

Commit d20d714

Browse files
author
Terry Smith
authored
Merge pull request #30 from ausaccessfed/develop
Develop
2 parents 0f32790 + 86b9f72 commit d20d714

25 files changed

+301
-169
lines changed

‎VERSION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
AAF_IdP_Installer_version= 1.0.0
2-
Shibboleth_IdP_version= 4.1.0
3-
Jetty_version= 9.4.38.v20210224
1+
AAF_IdP_Installer_version= 1.1.0
2+
Shibboleth_IdP_version= 4.1.2
3+
Jetty_version= 9.4.43.v20210629

‎assets/idp.example.edu.dist/idp/branding/messages/messages.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# You can define message properties here to override messages defined in
2-
# system/messages/ or to add your own messages.
2+
# the system-supplied message file or to add your own messages.
33

44
idp.title = {{ organisation_name }} Login Service
55
idp.logo = /images/logo.png

‎assets/idp.example.edu.dist/idp/branding/views/error.vm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@
3434
#set ($eventKey = $springMacroRequestContext.getMessage("$eventId", "error"))
3535
#set ($titleSuffix = $springMacroRequestContext.getMessage("${eventKey}.title", "$defaultTitleSuffix"))
3636
#set ($message = $springMacroRequestContext.getMessage("${eventKey}.message", "$defaultTitleSuffix: $eventId"))
37+
$response.setStatus(500)
3738
#else
3839
## This is a catch-all that theoretically shouldn't happen?
3940
#set ($titleSuffix = $defaultTitleSuffix)
4041
#set ($message = $springMacroRequestContext.getMessage("idp.message", "An unidentified error occurred."))
42+
$response.setStatus(500)
4143
#end
4244
##
4345
<!DOCTYPE html>
@@ -70,4 +72,4 @@
7072

7173
</div>
7274
</body>
73-
</html>
75+
</html>

‎assets/idp.example.edu.dist/idp/branding/views/logout.vm‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@
2525
<head>
2626
<meta charset="utf-8">
2727
<meta name="viewport" content="width=device-width,initial-scale=1.0">
28-
#*
2928
#if ($promptForSP)
3029
<meta http-equiv="refresh" content="10;url=$flowExecutionUrl&_eventId=propagate">
3130
#elseif ($promptForIdP)
3231
<meta http-equiv="refresh" content="10;url=$flowExecutionUrl&_eventId=local">
3332
#end
34-
*#
3533
<title>#springMessageText("idp.title", "Web Login Service")</title>
3634
<link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
3735
</head>
@@ -130,4 +128,4 @@
130128
</div>
131129

132130
</body>
133-
</html>
131+
</html>

‎assets/idp.example.edu.dist/idp/branding/webapp/js/jquery-3.4.1.min.js‎

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

‎assets/idp.example.edu.dist/idp/branding/webapp/js/jquery-3.6.0.min.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/idp.example.edu.dist/idp/conf/admin/admin.properties‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Configure properties controlling administrative features
2+
3+
#idp.status.logging = Status
4+
#idp.status.accessPolicy = AccessByIPAddress
5+
#idp.status.authenticated = false
6+
#idp.status.nonBrowserSupported = false
7+
#idp.status.resolveAttributes = false
8+
9+
#idp.reload.logging = Reload
10+
#idp.reload.accessPolicy = AccessByIPAddress
11+
#idp.reload.authenticated = false
12+
#idp.reload.nonBrowserSupported = false
13+
#idp.reload.resolveAttributes = false
14+
15+
#idp.resolvertest.logging = ResolverTest
16+
#idp.resolvertest.accessPolicy = AccessByIPAddress
17+
#idp.resolvertest.authenticated = false
18+
#idp.resolvertest.nonBrowserSupported = false
19+
#idp.resolvertest.resolveAttributes = false
20+
21+
#idp.mdquery.logging = MetadataQuery
22+
#idp.mdquery.accessPolicy = AccessByIPAddress
23+
#idp.mdquery.authenticated = false
24+
#idp.mdquery.nonBrowserSupported = false
25+
#idp.mdquery.resolveAttributes = false
26+
27+
#idp.metrics.logging = Metrics
28+
#idp.metrics.authenticated = false
29+
#idp.metrics.nonBrowserSupported = false
30+
#idp.metrics.resolveAttributes = false
31+
# See admin/metrics.xml for other configuration
32+
33+
#idp.hello.logging = Hello
34+
#idp.hello.accessPolicy = AccessByAdminUser
35+
#idp.hello.authenticated = true
36+
#idp.hello.nonBrowserSupported = false
37+
#idp.hello.resolveAttributes = true
38+
39+
#idp.lockout.logging = Lockout
40+
#idp.lockout.accessPolicy = AccessDenied
41+
#idp.lockout.authenticated = false
42+
#idp.lockout.nonBrowserSupported = false
43+
#idp.lockout.resolveAttributes = false
44+
45+
#idp.storage.logging = Storage
46+
#idp.storage.accessPolicy = AccessDenied
47+
#idp.storage.authenticated = false
48+
#idp.storage.nonBrowserSupported = false
49+
#idp.storage.resolveAttributes = false
50+
51+
#idp.unlock-keys.logging = UnlockKeys
52+
#idp.unlock-keys.accessPolicy = AccessDenied
53+
#idp.unlock-keys.authenticated = true
54+
#idp.unlock-keys.nonBrowserSupported = false
55+
#idp.unlock-keys.resolveAttributes = false

‎assets/idp.example.edu.dist/idp/conf/admin/general-admin.xml‎

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

‎assets/idp.example.edu.dist/idp/conf/admin/metrics.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<value>idp.entityID</value>
7474
</util:set>
7575
-->
76-
76+
7777
<!-- If you don't specify an alternate access policy, this named policy will be enforced. -->
7878
<bean id="shibboleth.metrics.DefaultAccessPolicy" class="java.lang.String" c:_0="AccessByIPAddress" />
7979

‎assets/idp.example.edu.dist/idp/conf/global.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<!-- Use this file to define any custom beans needed globally. -->
1616

1717
<!--
18-
Algorithm whitelists and blacklists that override or merge with library defaults. Normally you can leave
19-
these empty or commented and use the system defaults, but you can override those defaults using these lists.
20-
Each <value> element is an algorithm URI, or you can use <util:constant> elements in place of literal values.
18+
Algorithm include/exclude sets that override or merge with library defaults. Normally you can leave these
19+
empty or commented and use the system defaults, but you can override those defaults using these beans.
20+
Each <value> element is an algorithm URI; you can also use <util:constant> elements in place of literal values.
2121
-->
2222

2323
<!--

0 commit comments

Comments
 (0)