import java.util.HashMap;\r
import java.util.List;\r
import java.util.Map;\r
+import java.util.StringTokenizer;\r
\r
import org.apache.http.HttpEntity;\r
import org.apache.http.HttpResponse;\r
import org.apache.http.util.EntityUtils;\r
import org.apache.log4j.Logger;\r
\r
-import com.indexdata.masterkey.config.MissingMandatoryParameterException;\r
import com.indexdata.masterkey.pazpar2.client.exceptions.Pazpar2ErrorException;\r
import com.indexdata.mkjsf.config.Configuration;\r
import com.indexdata.mkjsf.config.ConfigurationReader;\r
import com.indexdata.mkjsf.pazpar2.SearchClient;\r
import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;\r
import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Command;\r
-import com.indexdata.mkjsf.pazpar2.sp.auth.AuthenticationEntity;\r
+import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;\r
import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;\r
import com.indexdata.mkjsf.utils.Utils;\r
\r
-\r
public class ServiceProxyClient implements SearchClient {\r
\r
private static final long serialVersionUID = -4031644009579840277L;\r
public static final String MODULENAME = "proxyclient";\r
public static final String SERVICE_PROXY_URL = "SERVICE_PROXY_URL";\r
public static final String SP_INIT_DOC_PATHS = "SP_INIT_DOC_PATHS";\r
- private String serviceUrl = "undefined";\r
- private String[] initDocPaths = null;\r
+ private String selectedServiceUrl = "";\r
+ private List<String> serviceUrls = new ArrayList<String>();\r
+ private List<String> initDocPaths = null;\r
private Configuration config = null;\r
\r
ProxyPz2ResponseHandler handler = new ProxyPz2ResponseHandler();\r
- private HttpClient client;\r
- private ServiceProxyUser user;\r
+ private transient HttpClient client; \r
private Pazpar2Command checkAuth = null;\r
-\r
+ private Pazpar2Command ipAuth = null;\r
\r
public ServiceProxyClient () {\r
SchemeRegistry schemeRegistry = new SchemeRegistry();\r
schemeRegistry.register(new Scheme("http", 80, PlainSocketFactory.getSocketFactory()));\r
ClientConnectionManager cm = new PoolingClientConnectionManager(schemeRegistry);\r
- client = new DefaultHttpClient(cm); \r
+ client = new DefaultHttpClient(cm);\r
}\r
\r
@Override\r
logger.info(Utils.objectId(this) + " is configuring using the provided " + Utils.objectId(configReader));\r
try {\r
config = configReader.getConfiguration(this); \r
- serviceUrl = config.getMandatory(SERVICE_PROXY_URL); \r
+ serviceUrls = getMultiProperty(config.get(SERVICE_PROXY_URL));\r
+ if (serviceUrls.size()==1) {\r
+ selectedServiceUrl = serviceUrls.get(0);\r
+ }\r
this.initDocPaths = getMultiProperty(config.get(SP_INIT_DOC_PATHS));\r
- checkAuth = new Pazpar2Command("auth",null);\r
+ checkAuth = new AuthCommand(null);\r
checkAuth.setParameterInState(new CommandParameter("action","=","check"));\r
+ ipAuth = new AuthCommand(null);\r
+ ipAuth.setParameterInState(new CommandParameter("action","=","ipauth"));\r
} catch (ConfigurationException c) {\r
c.printStackTrace();\r
- } catch (MissingMandatoryParameterException mmp) {\r
- mmp.printStackTrace();\r
} \r
}\r
\r
- private String[] getMultiProperty(String prop) { \r
- if (prop != null) {\r
- return prop.split(",");\r
- } else {\r
- return null;\r
+ private List<String> getMultiProperty(String prop) {\r
+ List<String> props = new ArrayList<String>();\r
+ if (prop != null) { \r
+ StringTokenizer tokenizer = new StringTokenizer(prop,",");\r
+ while (tokenizer.hasMoreElements()) {\r
+ props.add(tokenizer.nextToken());\r
+ } \r
}\r
+ return props;\r
}\r
\r
- public boolean authenticate (AuthenticationEntity user) {\r
+ public boolean authenticate (ServiceProxyUser user) {\r
try { \r
- logger.info("Authenticating [" + user.getProperty("name") + "]");\r
- this.user = (ServiceProxyUser) user; \r
- Pazpar2Command auth = new Pazpar2Command("auth",null);\r
+ logger.info("Authenticating [" + user.getProperty("name") + "]"); \r
+ Pazpar2Command auth = new AuthCommand(null);\r
auth.setParametersInState(new CommandParameter("action","=","login"), \r
new CommandParameter("username","=",user.getProperty("name")), \r
new CommandParameter("password","=",user.getProperty("password"))); \r
String responseStr = new String(response,"UTF-8");\r
logger.info(responseStr); \r
if (responseStr.contains("FAIL")) {\r
- this.user.isAuthenticated(false);\r
+ user.isAuthenticated(false);\r
return false;\r
} else {\r
- this.user.isAuthenticated(true);\r
+ user.isAuthenticated(true);\r
return true;\r
} \r
} catch (ClientProtocolException e) {\r
} \r
}\r
\r
- public boolean checkAuthentication () { \r
+ public boolean checkAuthentication (ServiceProxyUser user) { \r
try {\r
byte[] response = send(checkAuth);\r
logger.info(new String(response,"UTF-8"));\r
String responseStr = new String(response,"UTF-8"); \r
+ if (responseStr.contains("FAIL")) { \r
+ user.isAuthenticated(false);\r
+ return false;\r
+ } else { \r
+ user.isAuthenticated(true);\r
+ return true;\r
+ } \r
+ } catch (ClientProtocolException e) {\r
+ // TODO Auto-generated catch block\r
+ e.printStackTrace();\r
+ return false;\r
+ } catch (IOException e) {\r
+ // TODO Auto-generated catch block\r
+ e.printStackTrace();\r
+ return false;\r
+ } \r
+ }\r
+ \r
+ public boolean ipAuthenticate (ServiceProxyUser user) {\r
+ try {\r
+ byte[] response = send(ipAuth);\r
+ logger.info(new String(response,"UTF-8"));\r
+ String responseStr = new String(response,"UTF-8"); \r
if (responseStr.contains("FAIL")) {\r
- this.user.isAuthenticated(false);\r
+ user.isAuthenticated(false);\r
return false;\r
} else {\r
- this.user.isAuthenticated(true);\r
+ user.isAuthenticated(true);\r
return true;\r
} \r
} catch (ClientProtocolException e) {\r
e.printStackTrace();\r
return false;\r
} \r
+ \r
}\r
\r
public boolean isAuthenticatingClient () {\r
return true;\r
}\r
\r
- public boolean isAuthenticated () {\r
+ public boolean isAuthenticated (ServiceProxyUser user) {\r
if (user.getProperty("name") != null && user.getProperty("password") != null) {\r
- return checkAuthentication();\r
+ return checkAuthentication(user);\r
} else {\r
return false;\r
}\r
* @throws IOException\r
*/\r
private byte[] send(Pazpar2Command command) throws ClientProtocolException, IOException {\r
- String url = serviceUrl + "?" + command.getEncodedQueryString(); \r
+ String url = selectedServiceUrl + "?" + command.getEncodedQueryString(); \r
logger.info("Sending request "+url); \r
HttpGet httpget = new HttpGet(url); \r
byte[] response = client.execute(httpget, handler); \r
return response;\r
}\r
\r
- private byte[] send (String queryString) throws ClientProtocolException, IOException {\r
- String url = serviceUrl + "?" + queryString; \r
- logger.info("Sending request "+url); \r
- HttpGet httpget = new HttpGet(url); \r
- byte[] response = client.execute(httpget, handler); \r
- return response;\r
- \r
- }\r
- \r
public class ProxyPz2ResponseHandler implements ResponseHandler<byte[]> {\r
private StatusLine statusLine = null;\r
public byte[] handleResponse(HttpResponse response) throws ClientProtocolException, IOException {\r
logger.debug("Cloning Pz2Client");\r
ServiceProxyClient clone = new ServiceProxyClient();\r
clone.client = this.client;\r
- clone.serviceUrl = this.serviceUrl;\r
+ clone.serviceUrls = this.serviceUrls;\r
+ clone.selectedServiceUrl = this.selectedServiceUrl;\r
clone.initDocPaths = this.initDocPaths;\r
return clone;\r
}\r
@Override\r
public List<String> documentConfiguration () {\r
List<String> doc = new ArrayList<String>();\r
- doc.add(nl+ MODULENAME + " was configured to access the Pazpar2 service proxy at: " + serviceUrl);\r
+ doc.add(nl+ MODULENAME + " was configured to access the Pazpar2 service proxy at: " + (selectedServiceUrl.length()>0 ? selectedServiceUrl : "[not defined yet]"));\r
return null;\r
}\r
\r
public byte[] postInitDoc (String filePath) throws IOException {\r
logger.info("Looking to post the file in : [" + filePath +"]");\r
- HttpPost post = new HttpPost(serviceUrl+"?command=init&includeDebug=yes");\r
+ HttpPost post = new HttpPost(selectedServiceUrl+"?command=init&includeDebug=yes");\r
File initDoc = new File(filePath);\r
logger.info("Posting to SP: ");\r
if (logger.isDebugEnabled()) {\r
return response;\r
}\r
\r
- public String[] getInitDocPaths () {\r
+ public List<String> getInitDocPaths () {\r
logger.debug("Get init doc paths ");\r
- logger.debug("length: " + initDocPaths.length);\r
+ logger.debug("length: " + initDocPaths.size());\r
return initDocPaths;\r
}\r
\r
- public byte[] postInitDoc(byte[] initDoc) throws IOException {\r
- HttpPost post = new HttpPost(serviceUrl+"?command=init&includeDebug=yes");\r
+ public byte[] postInitDoc(byte[] initDoc, boolean includeDebug) throws IOException {\r
+ HttpPost post = new HttpPost(selectedServiceUrl+"?command=init" + (includeDebug? "&includeDebug=yes" : ""));\r
post.setEntity(new ByteArrayEntity(initDoc));\r
byte[] response = client.execute(post, handler);\r
logger.debug("Response on POST was: " + new String(response,"UTF-8")); \r
}\r
\r
public void setServiceProxyUrl (String url) {\r
- serviceUrl = url;\r
+ selectedServiceUrl = url;\r
}\r
\r
public String getServiceProxyUrl () {\r
- return serviceUrl;\r
+ return selectedServiceUrl;\r
}\r
\r
+ public List<String> getServiceProxyUrls () {\r
+ return serviceUrls;\r
+ }\r
+ \r
public Configuration getConfiguration () {\r
return config;\r
}\r
projects / mkjsf-moved-to-github.git / blobdiff