From bc2a4b136d280fa3d3b4f0d0caca41e98c683d56 Mon Sep 17 00:00:00 2001
From: Adam Wead <amsterdamos@gmail.com>
Date: Wed, 18 Feb 2015 16:19:07 -0500
Subject: [PATCH] Enabling basic authorization for Fedora

---
 README.md                        |  2 ++
 contexts/fedora.xml              | 10 ++++++++++
 etc/fedora-override-web.xml      |  4 ----
 resources/jetty-users.properties |  7 +++++++
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 resources/jetty-users.properties

diff --git a/README.md b/README.md
index 8fc1c0f..eb83353 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,8 @@ When jetty is finished initializing itself, Solr is available at
 and Fedora is available at
 
 * [http://localhost:8983/fedora/](http://localhost:8983/fedora/)
+* basic authorization is enabled an requires the username/password `fedoraAdmin/fedoraAdmin`
+* this is configured under [jetty-users.properties](resources/jetty-users.properties)
 
 You can see a list of all installed applications at
 
diff --git a/contexts/fedora.xml b/contexts/fedora.xml
index 72fc219..55d3a1f 100644
--- a/contexts/fedora.xml
+++ b/contexts/fedora.xml
@@ -4,4 +4,14 @@
   <Set name="contextPath">/fedora</Set>
   <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/fedora.war</Set>
   <Set name="overrideDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/fedora-override-web.xml</Set>
+  
+  <Get name="securityHandler">
+    <Set name="loginService">
+      <New class="org.eclipse.jetty.security.HashLoginService">
+        <Set name="name">fcrepo4</Set>
+        <Set name="config"><SystemProperty name="jetty.home" default="."/>/resources/jetty-users.properties</Set>
+      </New>
+    </Set>
+  </Get>
+
 </Configure>
diff --git a/etc/fedora-override-web.xml b/etc/fedora-override-web.xml
index 8e18d09..5f27255 100644
--- a/etc/fedora-override-web.xml
+++ b/etc/fedora-override-web.xml
@@ -35,8 +35,6 @@
 
   </servlet-mapping>
 
-  <!--Uncomment section below to enable Basic-Authentication-->
-  <!--
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>Fedora4</web-resource-name>
@@ -62,7 +60,5 @@
     <auth-method>BASIC</auth-method>
     <realm-name>fcrepo</realm-name>
   </login-config>
-  -->
-
 
 </web-app>
diff --git a/resources/jetty-users.properties b/resources/jetty-users.properties
new file mode 100644
index 0000000..3aef766
--- /dev/null
+++ b/resources/jetty-users.properties
@@ -0,0 +1,7 @@
+# Fedora users and passwords. Each line corresponds to:
+#
+# username:  password, role
+#
+# Where role is either fedoraUser or fedoraAdmin as outlined in contexts/fedora.xml
+fedoraUser: fedoraUser,fedoraUser
+fedoraAdmin: fedoraAdmin,fedoraAdmin