Skip to content
Jump to bottom

add basic auth #39

Merged
merged 1 commit into from
Dec 8, 2020
+392 −9
Merged

add basic auth #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Workbench/configs-and-secrets/grouper/shibboleth/shibboleth2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<Handler type="MetadataGenerator" Location="/Metadata" signing="false"/>

<!-- Status reporting service. -->
<Handler type="Status" Location="/Status" acl="127.0.0.1 ::1 172.16.0.0/12"/>
<Handler type="Status" Location="/Status" acl="127.0.0.1 ::1 172.16.0.0/12 192.168.0.0/16"/>

<!-- Session diagnostic service. -->
<Handler type="Session" Location="/Session" showAttributeValues="true"/>
Expand Down
2 changes: 1 addition & 1 deletion Workbench/idp/shibboleth-idp/conf/access-control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<entry key="AccessByIPAddress">
<bean id="AccessByIPAddress" parent="shibboleth.IPRangeAccessControl"
p:allowedRanges="#{ {'127.0.0.1/32', '::1/128', '172.16.0.0/12'} }" />
p:allowedRanges="#{ {'127.0.0.1/32', '::1/128', '172.16.0.0/12', '192.168.0.0/16'} }" />
</entry>

<!--
Expand Down
1 change: 1 addition & 0 deletions Workbench/mq/container_files/usr-local-bin/initialize-rabbitmq.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ echo "Waiting for the server to start up..."
rabbitmqctl -t 30 wait $RABBITMQ_PID_FILE
echo "OK, creating sampleQueue..."
rabbitmqadmin declare queue name=sampleQueue
rabbitmqctl change_password guest password
echo "Done"
touch $RABBITMQ_INIT_DONE_FILE
3 changes: 3 additions & 0 deletions Workbench/webproxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ FROM tier/shibboleth_sp:latest
ARG CSPHOSTNAME=localhost
ENV CSPHOSTNAME=$CSPHOSTNAME

#COPY container_files/httpd/httpd.conf /etc/httpd/conf/
COPY container_files/httpd/proxy.conf /etc/httpd/conf.d/
COPY container_files/httpd/shib.conf /etc/httpd/conf.d/
COPY container_files/httpd/ssl.conf /etc/httpd/conf.d/
COPY container_files/httpd/index.html /var/www/html/
COPY container_files/httpd/csp_logo.jpg /var/www/html/
COPY container_files/httpd/server-chain.crt /etc/pki/tls/certs/server-chain.crt
COPY container_files/httpd/.htpasswd /etc/httpd/
COPY container_files/httpd/localhost.crt /etc/pki/tls/certs/localhost.crt
COPY container_files/httpd/localhost.key /etc/pki/tls/private/localhost.key
RUN chmod 600 /etc/pki/tls/certs/localhost.crt && chmod 600 /etc/pki/tls/private/localhost.key
Expand Down
2 changes: 2 additions & 0 deletions Workbench/webproxy/container_files/httpd/.htpasswd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
csp:$apr1$/AqZo5q1$D0h7ClOUpgCvUhayr6oOg0
guest:$apr1$E6QtcEtu$/YXrr/F4OpNmTClXGBXpX/
Loading