Merge pull request #147 from watucker/disable-publisher-authz

Bare-minimum changes to disable publisher authorisation

README

@@ -1,6 +1,32 @@
-DESCRIPTION
+esg-search
+==========
+
+Search API and publishing module for ESGF (see description below)
+
+Manual esg-search update
+------------------------
+
+
+# Using > v4.0, service control differs with v2.x, use esg-node stop/start
+# download search module (verify module version
+wget https://github.com/ESGF/esg-search/releases/download/v4.18.0/esg-search.war
+/usr/local/tomcat/bin/catalina.sh stop # stop tomcat
+mv /usr/local/tomcat/webapps/esg-search /tmp # move old version aside
+rm -rf /usr/local/tomcat/work/Catalina/localhost/esg-search # clean out cache
+cp esg-search.war /usr/local/tomcat/webapps
+/usr/local/tomcat/bin/catalina.sh start # restart tomcat
 
 
+
+Latest version: v4.17.10
+------------------------
+ - Relaxed solr master autocommit to reduce write frequency
+ - enabled from / to search based on _timestamp
+
+
+DESCRIPTION
+-----------
+
 This module contains the next generation search functionality for the Earth System Grid Federation, 
 built upon the Apache Solr search engine. The package contains functionality for:
 

src/java/main/esg/search/config/security-context.xml

@@ -31,12 +31,5 @@
 	<security:authentication-manager alias="authenticationManager" />
   	<bean id="myUserDetailsService" class="esg.orp.orp.MyUserDetailsService" />
 
-  	<!-- Authorizer used to secure publishing requests -->
-    <bean name="authorizer" class="esg.orp.app.SAMLAuthorizer">
-        <property name="endpoints">
-                <value>${security.authz.service.endpoint}</value>
-        </property>
-    </bean>
-
 
 </beans>

src/java/main/esg/search/publish/impl/SecurePublishingServiceImpl.java

@@ -37,8 +37,7 @@ public SecurePublishingServiceImpl(final @Qualifier("publishingService") Publish
         this.publishingService = publishingService;
     }
 
-    // NOTE: remove @Autowired to disable access control
-    @Autowired
+    @Autowired(required=false)
     public void setAuthorizerAdpater(AuthorizerAdapter authorizer) {
         this.authorizer = authorizer;
     }

src/java/main/esg/search/publish/security/AuthorizerAdapter.java

@@ -32,8 +32,7 @@ public class AuthorizerAdapter {
 
     private final Log LOG = LogFactory.getLog(this.getClass());
 
-    // Note: comment out @Autowired to disable security
-    @Autowired
+    @Autowired(required=false)
     public void setAuthorizer(Authorizer authorizer) {
         this.authorizer = authorizer;
     }