Merge pull request #39 from internet2/PCupdates

add basic auth
internet2 · Dec 8, 2020 · 1f8c0e4 · 1f8c0e4
2 parents cc3396e + 862eafa
commit 1f8c0e4
Show file tree

Hide file tree

Showing 10 changed files with 392 additions and 9 deletions.
diff --git a/Workbench/configs-and-secrets/grouper/shibboleth/shibboleth2.xml b/Workbench/configs-and-secrets/grouper/shibboleth/shibboleth2.xml
@@ -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"/>

diff --git a/Workbench/idp/shibboleth-idp/conf/access-control.xml b/Workbench/idp/shibboleth-idp/conf/access-control.xml
@@ -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>
 
         <!--

diff --git a/Workbench/mq/container_files/usr-local-bin/initialize-rabbitmq.sh b/Workbench/mq/container_files/usr-local-bin/initialize-rabbitmq.sh
@@ -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
diff --git a/Workbench/webproxy/Dockerfile b/Workbench/webproxy/Dockerfile
@@ -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

diff --git a/Workbench/webproxy/container_files/httpd/.htpasswd b/Workbench/webproxy/container_files/httpd/.htpasswd
@@ -0,0 +1,2 @@
+csp:$apr1$/AqZo5q1$D0h7ClOUpgCvUhayr6oOg0
+guest:$apr1$E6QtcEtu$/YXrr/F4OpNmTClXGBXpX/