You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2015/12/14 23:54:15 UTC
svn commit: r1720036 -
/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/crypto/Crypto.java
Author: burn
Date: Mon Dec 14 22:54:15 2015
New Revision: 1720036
URL: http://svn.apache.org/viewvc?rev=1720036&view=rev
Log:
UIMA-4705 Fold the ducc.security.home changes into the 2.0.1 branch
Modified:
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/crypto/Crypto.java
Modified: uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/crypto/Crypto.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/crypto/Crypto.java?rev=1720036&r1=1720035&r2=1720036&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/crypto/Crypto.java (original)
+++ uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/crypto/Crypto.java Mon Dec 14 22:54:15 2015
@@ -44,6 +44,7 @@ import java.security.spec.RSAPublicKeySp
import javax.crypto.Cipher;
import org.apache.uima.ducc.common.utils.AlienFile;
+import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
public class Crypto implements ICrypto {
@@ -85,8 +86,17 @@ public class Crypto implements ICrypto {
init(user,dirHome,dirSub,accessType);
}
+ private String resolveSecurityHome(String tgtUser, String dirHome) {
+ String ducc_security_home = DuccPropertiesResolver.get("ducc.security.home"); // DuccPropertiesResolver.ducc_security_home
+ if (ducc_security_home != null) {
+ dirHome = ducc_security_home + "/" + tgtUser;
+ }
+ return dirHome;
+ }
+
private void init(String tgtUser, String dirHome, String dirSub, AccessType accessType) throws CryptoException {
user = tgtUser;
+ dirHome = resolveSecurityHome(tgtUser, dirHome);
dirUserKeys = dirHome+File.separator+dirSub;
filePub = dirUserKeys+File.separator+"public.key";
filePvt = dirUserKeys+File.separator+"private.key";