xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #3255 Fixing dependencies to fix the DPA

Browse source 
Change-Id: If2625cda7b73b52b6e79f3a6b8ac580dbcf1ecc9

Former-commit-id: 075bb856689e8eaa95ee7721b6270c3a785c9bd4
This commit is contained in:
Benjamin Phillippe 2014-07-24 11:21:00 -05:00
parent a03474e85b
commit a19c9c1243
8 changed files with 68 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/build.edex/esb/etc/centralRegistry.sh
View file

@ -19,7 +19,7 @@
# further licensing information.
##
export MAX_MEM=1536 # in Meg
export MAX_MEM=2048 # in Meg
export MAX_PERM_SIZE=192m
export EDEX_DEBUG_PORT=5011
export EDEX_JMX_PORT=1622

21
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-impl.xml
View file

@ -1,8 +1,6 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<bean id="encryption" class="com.raytheon.uf.common.security.encryption.AESEncryptor"/>
<bean id="edexRegistryManagerFactory"
class="com.raytheon.uf.edex.registry.ebxml.util.EDEXRegistryManagerFactory">
@ -39,25 +37,6 @@
<constructor-arg ref="AuditableEventTypeDao" />
<constructor-arg ref="slotTypeDao"/>
</bean>
<bean id="objectReferenceResolver" class="com.raytheon.uf.edex.registry.ebxml.services.lifecycle.ObjectReferenceResolver">
<property name="registryObjectDao" ref="registryObjectDao"/>
<property name="dynamicRefDao" ref="dynamicObjectRefDao"/>
<property name="queryManager" ref="queryServiceImpl"/>
<property name="registryRestClient" ref="registryRestClient"/>
</bean>
<bean id="registryXpathProcessor" class="com.raytheon.uf.edex.registry.ebxml.util.xpath.RegistryXPathProcessor">
<constructor-arg ref="registryJaxbManager"/>
<constructor-arg ref="registryNamespaceMapper"/>
</bean>
<bean id="registryJaxbManager" class="com.raytheon.uf.common.registry.RegistryJaxbManager">
<constructor-arg ref="registryNamespaceMapper"/>
</bean>
<bean id="registryNamespaceMapper" class="com.raytheon.uf.common.registry.RegistryNamespaceMapper"/>
<!-- Util to get the IDS of the Registry server nodes -->
<bean id="registryIdUtil"

36
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml
View file

@ -3,9 +3,12 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<bean id="registryPasswordCallback" class="com.raytheon.uf.edex.registry.ebxml.acp.PasswordCallback">
<property name="credentialCache" ref="credentialCache"/>
</bean>
<bean id="credentialCache"
class="com.raytheon.uf.edex.registry.ebxml.web.security.CredentialCache"
factory-method="getInstance">
class="com.raytheon.uf.edex.registry.ebxml.web.security.CredentialCache">
<property name="restServices" ref="registryRestClient" />
<property name="personDao" ref="personDao" />
<property name="txTemplate" ref="metadataTxTemplate" />
@ -18,6 +21,7 @@
<property name="serviceConfig" ref="RegistryServiceConfig" />
<property name="securityConfig" ref="securityConfiguration" />
</bean>
<bean id="registryWebServiceClient"
class="com.raytheon.uf.edex.registry.ebxml.services.soap.RegistrySOAPServices">
<property name="securityInterceptor" ref="securityOutInterceptor" />
@ -30,11 +34,6 @@
<bean id="webServiceInInterceptor"
class="com.raytheon.uf.edex.registry.ebxml.services.RegistryServiceInInterceptor" />
<bean id="xacmlInterceptor" class="com.raytheon.uf.edex.registry.acp.xacml.XACMLInterceptor">
<constructor-arg ref="XACMLPolicyAdministrator"/>
<constructor-arg ref="XACMLPolicyDecisionPoint"/>
</bean>
<bean id="authenticationInterceptor" class="org.apache.cxf.interceptor.security.JAASLoginInterceptor">
<property name="contextName" value="RegistryRealm"/>
@ -52,14 +51,33 @@
<entry key="user" value="${edex.security.keystore.alias}" />
<entry key="signaturePropRefId" value="propRef"/>
<entry key="propRef" value-ref="encryptedPropertyLoader"/>
<entry key="passwordCallbackClass"
value="com.raytheon.uf.edex.registry.ebxml.acp.PasswordCallback" />
<entry key="passwordCallbackRef">
<ref bean="registryPasswordCallback"/>
</entry>
<entry key="signatureParts"
value="{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body" />
<entry key="signatureAlgorithm" value="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
</map>
</constructor-arg>
</bean>
<bean id="registryJaxbManager" class="com.raytheon.uf.common.registry.RegistryJaxbManager">
<constructor-arg ref="registryNamespaceMapper"/>
</bean>
<bean id="registryNamespaceMapper" class="com.raytheon.uf.common.registry.RegistryNamespaceMapper"/>
<bean id="objectReferenceResolver" class="com.raytheon.uf.edex.registry.ebxml.services.lifecycle.ObjectReferenceResolver">
<property name="registryObjectDao" ref="registryObjectDao"/>
<property name="dynamicRefDao" ref="dynamicObjectRefDao"/>
<property name="queryManager" ref="queryServiceImpl"/>
<property name="registryRestClient" ref="registryRestClient"/>
</bean>
<bean id="registryXpathProcessor" class="com.raytheon.uf.edex.registry.ebxml.util.xpath.RegistryXPathProcessor">
<constructor-arg ref="registryJaxbManager"/>
<constructor-arg ref="registryNamespaceMapper"/>
</bean>
<!-- QUERY -->
<bean id="queryServiceImpl"

5
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-xacml.xml
View file

@ -2,6 +2,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<bean id="xacmlInterceptor" class="com.raytheon.uf.edex.registry.acp.xacml.XACMLInterceptor">
<constructor-arg ref="XACMLPolicyAdministrator"/>
<constructor-arg ref="XACMLPolicyDecisionPoint"/>
</bean>
<bean id="XACMLPolicyDecisionPoint" class="com.raytheon.uf.edex.registry.acp.xacml.XACMLPolicyDecisionPoint"/>
<bean id="XACMLContextHandler"

15
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/acp/PasswordCallback.java
View file

@ -42,6 +42,7 @@ import com.raytheon.uf.edex.registry.ebxml.web.security.CredentialCache;
* ------------ ---------- ----------- --------------------------
* Aug 3, 2012 bphillip Initial creation
* 7/10/2014 1717 bphillip Get user information from CredentialCache
* 7/24/2014 1712 bphillip Spring injection of CredentialCache
*
* </pre>
*
@ -49,6 +50,9 @@ import com.raytheon.uf.edex.registry.ebxml.web.security.CredentialCache;
* @version 1.0
*/
public class PasswordCallback implements CallbackHandler {
/** Cache of user credentials */
private CredentialCache credentialCache;
/**
* Creates a new PasswordCallback
@ -62,9 +66,18 @@ public class PasswordCallback implements CallbackHandler {
for (Callback call : callbacks) {
if (call instanceof WSPasswordCallback) {
WSPasswordCallback cb = (WSPasswordCallback) call;
cb.setPassword(CredentialCache.getInstance().getUserPassword(
cb.setPassword(credentialCache.getUserPassword(
((WSPasswordCallback) call).getIdentifier()));
}
}
}
/**
* @param credentialCache the credentialCache to set
*/
public void setCredentialCache(CredentialCache credentialCache) {
this.credentialCache = credentialCache;
}
}

13
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/CredentialCache.java
View file

@ -60,6 +60,7 @@ import com.raytheon.uf.edex.security.SecurityConfiguration;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 7/10/2014 1717 bphillip Initial creation
* 7/24/2014 1712 bphillip No longer singleton
* </pre>
*
* @author bphillip
@ -67,9 +68,6 @@ import com.raytheon.uf.edex.security.SecurityConfiguration;
**/
public class CredentialCache {
/** The singleton instance */
private static CredentialCache instance = new CredentialCache();
/** The registry REST services */
private RegistryRESTServices restServices;
@ -175,15 +173,6 @@ public class CredentialCache {
}
/**
* Gets the singleton instance of the Credential cache
*
* @return The singleton instance
*/
public static CredentialCache getInstance() {
return instance;
}
/**
* Listens for updates to users and invalidates their entries in the cache
* if they have changed

24
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/RegistryLoginModule.java
View file

@ -30,10 +30,12 @@ import org.eclipse.jetty.util.security.Credential;
import org.eclipse.jetty.util.security.Password;
import com.raytheon.uf.common.registry.services.RegistryServiceException;
import com.raytheon.uf.edex.core.EDEXUtil;
/**
*
* The registry login module used by the Jetty server hosting the registry services
* The registry login module used by the Jetty server hosting the registry
* services
*
* <pre>
*
@ -42,6 +44,7 @@ import com.raytheon.uf.common.registry.services.RegistryServiceException;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 7/10/2014 1717 bphillip Initial creation
* 7/24/2014 1712 bphillip Spring injection of CredentialCache
* </pre>
*
* @author bphillip
@ -49,24 +52,33 @@ import com.raytheon.uf.common.registry.services.RegistryServiceException;
**/
public class RegistryLoginModule extends AbstractLoginModule {
/** Cache of user credentials */
private CredentialCache credentialCache;
/**
* Creates a new RegistryLoginModule
*/
public RegistryLoginModule() {
super();
/*
* This class is instantiated via reflection by the Jetty server. Therefore
* direct spring injection is not possible
*/
this.credentialCache = (CredentialCache) EDEXUtil
.getESBComponent("credentialCache");
}
@Override
public UserInfo getUserInfo(final String userName) {
public UserInfo getUserInfo(final String userName) {
String[] user = null;
try {
user = CredentialCache.getInstance().getUser(userName);
user = credentialCache.getUser(userName);
} catch (RegistryServiceException e) {
throw new WebServiceException("User [" + userName
+ " Not authorized!",e);
+ " Not authorized!", e);
}
for(String userField:user){
if(userField == null){
for (String userField : user) {
if (userField == null) {
throw new WebServiceException("User [" + userName
+ " Not authorized!");
}

2
edexOsgi/com.raytheon.uf.edex.security/res/spring/edex-security.xml
View file

@ -4,6 +4,8 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<bean id="encryption" class="com.raytheon.uf.common.security.encryption.AESEncryptor"/>
<bean id="securityConfiguration" class="com.raytheon.uf.edex.security.SecurityConfiguration" />
<bean id="encryptedPropertyLoader" class="com.raytheon.uf.edex.security.EncryptedProperties">