http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/curator/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java ---------------------------------------------------------------------- diff --cc curator/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java index 0000000,5d77083..d0d399f mode 000000,100755..100755 --- a/curator/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java +++ b/curator/sso/src/main/java/org/apache/oodt/security/sso/opensso/SSOProxy.java @@@ -1,0 -1,308 +1,354 @@@ + /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + package org.apache.oodt.security.sso.opensso; + + -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.HttpException; -import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.NameValuePair; -import org.apache.commons.httpclient.methods.PostMethod; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStreamReader; ++ ++import org.apache.http.HttpException; ++import org.apache.http.HttpResponse; ++import org.apache.http.HttpStatus; ++import org.apache.http.NameValuePair; ++import org.apache.http.client.HttpClient; ++import org.apache.http.client.ResponseHandler; ++import org.apache.http.client.entity.UrlEncodedFormEntity; ++import org.apache.http.client.methods.HttpPost; ++import org.apache.http.impl.client.BasicResponseHandler; ++import org.apache.http.impl.client.DefaultHttpClient; ++import org.apache.http.message.BasicNameValuePair; ++ ++import java.io.*; ++import java.util.ArrayList; ++import java.util.Arrays; ++import java.util.List; + import java.util.logging.Level; + import java.util.logging.Logger; + + /** - * ++ * + * A client class to the services provided by the <a + * href="https://opensso.dev.java.net/";>OpenSSO</a> project. The descriptions of + * these services are <a + * href="http://developers.sun.com/identity/reference/techart/id-svcs.html"; + * >here</a>. - * ++ * + * @author mattmann + * @version $Revision$ - * ++ * + */ + public class SSOProxy implements SSOMetKeys { + + private static final Logger LOG = Logger.getLogger(SSOProxy.class.getName()); + private static final String AUTH_ENDPOINT; + private static final String AUTH_ENDPOINT_KEY = "AUTH_ENDPOINT"; + private static final String IDENT_READ_ENDPOINT; + private static final String IDENT_READ_ENDPOINT_KEY = "IDENT_READ_ENDPOINT"; + private static final String IDENT_ATTR_ENDPOINT; + private static final String IDENT_ATTR_ENDPOINT_KEY = "IDENT_ATTR_ENDPOINT"; + private static final String LOG_ENDPOINT; + private static final String LOG_ENDPOINT_KEY = "LOG_ENDPOINT"; - ++ + static { - if (System.getProperty(AUTH_ENDPOINT_KEY) != null) { - AUTH_ENDPOINT = System.getProperty(AUTH_ENDPOINT_KEY); - } else { - AUTH_ENDPOINT = AUTHENTICATE_ENDPOINT; - } - if (System.getProperty(IDENT_READ_ENDPOINT_KEY) != null) { - IDENT_READ_ENDPOINT = System.getProperty(IDENT_READ_ENDPOINT_KEY); - } else { - IDENT_READ_ENDPOINT = IDENTITY_READ_ENDPOINT; - } - if (System.getProperty(IDENT_ATTR_ENDPOINT_KEY) != null) { - IDENT_ATTR_ENDPOINT = System.getProperty(IDENT_ATTR_ENDPOINT_KEY); - } else { - IDENT_ATTR_ENDPOINT = IDENTITY_ATTRIBUTES_ENDPOINT; - } - if (System.getProperty(LOG_ENDPOINT_KEY) != null) { - LOG_ENDPOINT = System.getProperty(LOG_ENDPOINT_KEY); - } else { - LOG_ENDPOINT = LOGOUT_ENDPOINT; - } - - LOG.log(Level.INFO, AUTH_ENDPOINT_KEY + " set to " + AUTH_ENDPOINT); - LOG.log(Level.INFO, IDENT_READ_ENDPOINT_KEY + " set to " + IDENT_READ_ENDPOINT); - LOG.log(Level.INFO, IDENT_ATTR_ENDPOINT_KEY + " set to " + IDENT_ATTR_ENDPOINT); - LOG.log(Level.INFO, LOG_ENDPOINT_KEY + " set to " + LOG_ENDPOINT); ++ if (System.getProperty(AUTH_ENDPOINT_KEY) != null) { ++ AUTH_ENDPOINT = System.getProperty(AUTH_ENDPOINT_KEY); ++ } else { ++ AUTH_ENDPOINT = AUTHENTICATE_ENDPOINT; ++ } ++ if (System.getProperty(IDENT_READ_ENDPOINT_KEY) != null) { ++ IDENT_READ_ENDPOINT = System.getProperty(IDENT_READ_ENDPOINT_KEY); ++ } else { ++ IDENT_READ_ENDPOINT = IDENTITY_READ_ENDPOINT; ++ } ++ if (System.getProperty(IDENT_ATTR_ENDPOINT_KEY) != null) { ++ IDENT_ATTR_ENDPOINT = System.getProperty(IDENT_ATTR_ENDPOINT_KEY); ++ } else { ++ IDENT_ATTR_ENDPOINT = IDENTITY_ATTRIBUTES_ENDPOINT; ++ } ++ if (System.getProperty(LOG_ENDPOINT_KEY) != null) { ++ LOG_ENDPOINT = System.getProperty(LOG_ENDPOINT_KEY); ++ } else { ++ LOG_ENDPOINT = LOGOUT_ENDPOINT; ++ } ++ ++ LOG.log(Level.INFO, AUTH_ENDPOINT_KEY + " set to " + AUTH_ENDPOINT); ++ LOG.log(Level.INFO, IDENT_READ_ENDPOINT_KEY + " set to " + IDENT_READ_ENDPOINT); ++ LOG.log(Level.INFO, IDENT_ATTR_ENDPOINT_KEY + " set to " + IDENT_ATTR_ENDPOINT); ++ LOG.log(Level.INFO, LOG_ENDPOINT_KEY + " set to " + LOG_ENDPOINT); + } + + public String authenticate(String username, String password) { - HttpClient httpClient = new HttpClient(); - PostMethod post = new PostMethod(AUTH_ENDPOINT); ++ HttpClient httpClient = new DefaultHttpClient(); ++ HttpPost post = new HttpPost(AUTH_ENDPOINT); ++ //PostMethod post = new PostMethod(AUTH_ENDPOINT); + String response; + String ssoToken = null; + - NameValuePair[] data = { new NameValuePair("username", username), - new NameValuePair("password", password), - new NameValuePair("uri", "realm/lmmp") }; ++ NameValuePair[] data = { new BasicNameValuePair("username", username), ++ new BasicNameValuePair("password", password), ++ new BasicNameValuePair("uri", "realm/lmmp") }; + - post.setRequestBody(data); ++ UrlEncodedFormEntity entity = null; ++ try { ++ entity = new UrlEncodedFormEntity(Arrays.asList(data), "UTF-8"); ++ } catch (UnsupportedEncodingException e) { ++ e.printStackTrace(); ++ } ++ ++ post.setEntity(entity); + + try { - httpClient.executeMethod(post); - if (post.getStatusCode() != HttpStatus.SC_OK) { - throw new HttpException(post.getStatusLine().toString()); ++ HttpResponse response1 = httpClient.execute(post); ++ if (response1.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { ++ throw new HttpException(response1.getStatusLine().toString()); + } - response = post.getResponseBodyAsString().trim(); ++ ResponseHandler<String> handler = new BasicResponseHandler(); ++ ++ response = handler.handleResponse(response1); + ssoToken = response.substring(9); + } catch (Exception e) { + LOG.log(Level.SEVERE, e.getMessage()); + } finally { + post.releaseConnection(); + } + + return ssoToken; + } + + public IdentityDetails readIdentity(String username, String token) - throws IOException, SingleSignOnException { - HttpClient httpClient = new HttpClient(); - PostMethod post = new PostMethod(IDENT_READ_ENDPOINT); ++ throws IOException, SingleSignOnException { ++ HttpClient httpClient = new DefaultHttpClient(); ++ HttpPost post = new HttpPost(IDENT_READ_ENDPOINT); + LOG.log(Level.INFO, "Obtaining identity: username: [" + username - + "]: token: [" + token + "]: REST url: [" + IDENT_READ_ENDPOINT - + "]"); - NameValuePair[] data = { new NameValuePair("name", username), - new NameValuePair("admin", token) }; ++ + "]: token: [" + token + "]: REST url: [" + IDENT_READ_ENDPOINT ++ + "]"); ++ NameValuePair[] data = { new BasicNameValuePair("name", username), ++ new BasicNameValuePair("admin", token) }; + - post.setRequestBody(data); ++ UrlEncodedFormEntity entity = null; ++ try { ++ entity = new UrlEncodedFormEntity(Arrays.asList(data), "UTF-8"); ++ } catch (UnsupportedEncodingException e) { ++ e.printStackTrace(); ++ } ++ ++ post.setEntity(entity); + - httpClient.executeMethod(post); - if (post.getStatusCode() != HttpStatus.SC_OK) { - throw new SingleSignOnException(post.getStatusLine().toString()); ++ HttpResponse response1 = httpClient.execute(post); ++ if (response1.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { ++ throw new SingleSignOnException(response1.getStatusLine().toString()); + } + - return parseIdentityDetails(post.getResponseBodyAsString().trim()); ++ ResponseHandler<String> handler = new BasicResponseHandler(); ++ ++ ++ return parseIdentityDetails(handler.handleResponse(response1).trim()); + + } + + public UserDetails getUserAttributes(String token) throws IOException, SingleSignOnException { - HttpClient httpClient = new HttpClient(); - PostMethod post = new PostMethod(IDENT_ATTR_ENDPOINT); ++ HttpClient httpClient = new DefaultHttpClient(); ++ HttpPost post = new HttpPost(IDENT_READ_ENDPOINT); + LOG.log(Level.INFO, "Obtaining user attributes: token: [" + token - + "]: REST url: [" + IDENT_ATTR_ENDPOINT + "]"); - NameValuePair[] data = { new NameValuePair("subjectid", token) }; ++ + "]: REST url: [" + IDENT_ATTR_ENDPOINT + "]"); ++ NameValuePair[] data = { new BasicNameValuePair("subjectid", token) }; ++ ++ UrlEncodedFormEntity entity = null; ++ try { ++ entity = new UrlEncodedFormEntity(Arrays.asList(data), "UTF-8"); ++ } catch (UnsupportedEncodingException e) { ++ e.printStackTrace(); ++ } + - post.setRequestBody(data); ++ post.setEntity(entity); + - httpClient.executeMethod(post); - if (post.getStatusCode() != HttpStatus.SC_OK) { - throw new SingleSignOnException(post.getStatusLine().toString()); ++ HttpResponse response1 = httpClient.execute(post); ++ if (response1.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { ++ throw new SingleSignOnException(response1.getStatusLine().toString()); + } + - return parseUserDetails(post.getResponseBodyAsString().trim()); ++ ResponseHandler<String> handler = new BasicResponseHandler(); ++ ++ ++ return parseUserDetails(handler.handleResponse(response1).trim()); + + } + + public void logout(String token) { - HttpClient httpClient = new HttpClient(); - PostMethod post = new PostMethod(LOG_ENDPOINT); ++ HttpClient httpClient = new DefaultHttpClient(); ++ HttpPost post = new HttpPost(LOG_ENDPOINT); + LOG.log(Level.INFO, "Logging out: token: [" + token + "]: REST url: [" - + LOG_ENDPOINT + "]"); - NameValuePair[] data = { new NameValuePair("subjectid", token) }; - post.setRequestBody(data); ++ + LOG_ENDPOINT + "]"); ++ NameValuePair[] data = { new BasicNameValuePair("subjectid", token) }; ++ ++ ++ UrlEncodedFormEntity entity = null; ++ try { ++ entity = new UrlEncodedFormEntity(Arrays.asList(data), "UTF-8"); ++ } catch (UnsupportedEncodingException e) { ++ e.printStackTrace(); ++ } ++ ++ post.setEntity(entity); + + try { - httpClient.executeMethod(post); - if (post.getStatusCode() != HttpStatus.SC_OK) { - throw new HttpException(post.getStatusLine().toString()); ++ HttpResponse response1 = httpClient.execute(post); ++ if (response1.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { ++ throw new HttpException(response1.getStatusLine().toString()); + } + } catch (HttpException e) { + // TODO Auto-generated catch block + LOG.log(Level.SEVERE, e.getMessage()); + } catch (IOException e) { + // TODO Auto-generated catch block + LOG.log(Level.SEVERE, e.getMessage()); + } finally { + post.releaseConnection(); + } + } + + private IdentityDetails parseIdentityDetails(String serviceResponse) { + ByteArrayInputStream is = new ByteArrayInputStream(serviceResponse - .getBytes()); ++ .getBytes()); + BufferedReader br = new BufferedReader(new InputStreamReader(is)); + IdentityDetails details = new IdentityDetails(); + String line = null, lastAttrKeyRead = null; + + try { + while ((line = br.readLine()) != null) { + if (line.equals(IDENTITY_DETAILS_ATTR_SKIP_LINE)) { + continue; + } + String key, val; + if (line.startsWith(IDENTITY_DETAILS_REALM)) { + // can't parse it the same way + key = line.substring(0, IDENTITY_DETAILS_REALM.length()); + val = line.substring(IDENTITY_DETAILS_REALM.length() + 1); + } else { + String[] lineToks = line.split("="); + key = lineToks[0]; + val = lineToks[1]; + } + + if (key.equals(IDENTITY_DETAILS_NAME)) { + details.setName(val); + } else if (key.equals(IDENTITY_DETAILS_TYPE)) { + details.setType(val); + } else if (key.equals(IDENTITY_DETAILS_REALM)) { + details.setRealm(val); + } else if (key.equals(IDENTITY_DETAILS_GROUP)) { + details.getGroups().add(val); + } else if (key.equals(IDENTITY_DETAILS_ATTR_NAME)) { + lastAttrKeyRead = val; + } else if (key.equals(IDENTITY_DETAILS_ATTR_VALUE)) { + details.getAttributes().addMetadata(lastAttrKeyRead, val); + } + } + } catch (IOException e) { + LOG.log(Level.SEVERE, e.getMessage()); + LOG.log(Level.WARNING, "Error reading service response line: [" + line - + "]: Message: " + e.getMessage()); ++ + "]: Message: " + e.getMessage()); + } finally { + try { + is.close(); + } catch (Exception ignore) { + } + + try { + br.close(); + } catch (Exception ignore) { + } + + } + + return details; + } + + private UserDetails parseUserDetails(String serviceResponse) { + ByteArrayInputStream is = new ByteArrayInputStream(serviceResponse - .getBytes()); ++ .getBytes()); + BufferedReader br = new BufferedReader(new InputStreamReader(is)); + UserDetails details = new UserDetails(); + String line = null, lastAttrKeyRead = null; + + try { + while ((line = br.readLine()) != null) { + String key, val; + if (line.startsWith(USER_DETAILS_ROLE)) { + // can't parse by splitting, parse by using substring + key = line.substring(0, USER_DETAILS_ROLE.length()); + val = line.substring(USER_DETAILS_ROLE.length() + 1); + } else { + String[] lineToks = line.split("="); + key = lineToks[0]; + val = lineToks[1]; + } + + if (key.equals(USER_DETAILS_TOKEN)) { + details.setToken(val); + } else if (key.equals(USER_DETAILS_ROLE)) { + details.getRoles().add(val); + } else if (key.equals(USER_DETAILS_ATTR_NAME)) { + lastAttrKeyRead = val; + } else if (key.equals(USER_DETAILS_ATTR_VALUE)) { + details.getAttributes().addMetadata(lastAttrKeyRead, val); + } + } + } catch (IOException e) { + LOG.log(Level.SEVERE, e.getMessage()); + LOG.log(Level.WARNING, "Error reading service response line: [" + line - + "]: Message: " + e.getMessage()); ++ + "]: Message: " + e.getMessage()); + } finally { + try { + is.close(); + } catch (Exception ignore) { + } + + try { + br.close(); + } catch (Exception ignore) { + } + + } + + return details; + } + + public static void main(String[] args) throws IOException, SingleSignOnException { + String usage = "SSOProxy <cmd> [args]\n\n" + "Where cmd is one of:\n" - + "authenticate <user> <pass>\n" + "identity <user> <token>\n" - + "attributes <token>\nlogout <token>\n"; ++ + "authenticate <user> <pass>\n" + "identity <user> <token>\n" ++ + "attributes <token>\nlogout <token>\n"; + + if (args.length < 2 || args.length > 3) { + System.err.println(usage); + System.exit(1); + } + + String cmd = args[0]; + SSOProxy sso = new SSOProxy(); + if (cmd.equals(AUTH_COMMAND)) { + System.out.println(sso.authenticate(args[1], args[2])); + } else if (cmd.equals(IDENTITY_COMMAND)) { + System.out.println(sso.readIdentity(args[1], args[2])); + } else if (cmd.equals(ATTRIBUTES_COMMAND)) { + System.out.println(sso.getUserAttributes(args[1])); + } else if (cmd.equals(LOGOUT_COMMAND)) { + sso.logout(args[1]); + } + + } + + }
http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/filemgr/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/filemgr/src/main/bin/filemgr ---------------------------------------------------------------------- diff --cc filemgr/src/main/bin/filemgr index ece2532,02f5b90..9e5ffde --- a/filemgr/src/main/bin/filemgr +++ b/filemgr/src/main/bin/filemgr @@@ -58,10 -74,12 +74,12 @@@ case "$1" i echo -n "Starting cas file manager: " $JAVA_HOME/bin/java \ -cp ${LIB_DEPS} \ - -Djava.util.logging.config.file=${CAS_FILEMGR_HOME}/etc/logging.properties \ + ${DISTRIBUTED_CONF_PROPERTIES} \ + -Dlog4j.configuration=log4j.xml \ + -Djava.util.logging.config.file=${FILEMGR_HOME}/etc/logging.properties \ -Dorg.apache.oodt.cas.filemgr.properties=${CAS_FILEMGR_PROPS} \ - org.apache.oodt.cas.filemgr.system.XmlRpcFileManager \ - --portNum $SERVER_PORT & + org.apache.oodt.cas.filemgr.system.FileManagerServerMain \ + --portNum $SERVER_PORT & echo $! > ${RUN_HOME}/cas.filemgr.pid echo "OK" sleep 5 http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/MetadataDumper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/filemgr/src/test/resources/filemgr.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java ---------------------------------------------------------------------- diff --cc pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java index 9f750f5,4388855..f36431e --- a/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/util/FileManagerUtils.java @@@ -64,10 -65,10 +66,10 @@@ public class FileManagerUtils implement public FileManagerUtils(URL fileMgrUrl) { try { - fmgrClient = new XmlRpcFileManagerClient(fileMgrUrl); + fmgrClient = RpcCommunicationFactory.createClient(fileMgrUrl); } catch (ConnectionException e) { - LOG.log(Level.SEVERE, "Unable to connect to file manager: [" - + fileMgrUrl.toString() + "]"); + LOG.log(Level.SEVERE, + "Unable to connect to file manager: [" + fileMgrUrl.toString() + "]"); fmgrClient = null; } http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/resource/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FileManagerConn.java ---------------------------------------------------------------------- diff --cc webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FileManagerConn.java index 6deafc3,41c757a..eefd0c6 --- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FileManagerConn.java +++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FileManagerConn.java @@@ -44,10 -44,10 +45,10 @@@ import java.util.logging.Logger */ public class FileManagerConn { - private XmlRpcFileManagerClient fm; + private FileManagerClient fm; - private static final Logger LOG = Logger.getLogger(FileManagerConn.class - .getName()); + private static final Logger LOG = Logger + .getLogger(FileManagerConn.class.getName()); public FileManagerConn(String fmUrlStr) { this.initFm(fmUrlStr); @@@ -134,10 -146,10 +147,10 @@@ public void initFm(String urlStr) { try { - this.fm = new XmlRpcFileManagerClient(new URL(urlStr)); + this.fm = RpcCommunicationFactory.createClient(new URL(urlStr)); } catch (Exception e) { - LOG.log(Level.WARNING, "Unable to connect to the file manager at: [" - + urlStr + "]"); + LOG.log(Level.WARNING, + "Unable to connect to the file manager at: [" + urlStr + "]"); this.fm = null; } } http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/workflow/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/423444cb/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java ----------------------------------------------------------------------
