From 5b865cd30f3a0e3030b030e3e177a8400e2a123d Mon Sep 17 00:00:00 2001 From: Lionel Schwarz Date: Tue, 25 Nov 2014 14:05:47 +0100 Subject: [PATCH 1/2] use SystemProperty "java.io.tmpdir" instead of "/tmp" --- .../italiangrid/voms/clients/util/VOMSProxyPathBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/italiangrid/voms/clients/util/VOMSProxyPathBuilder.java b/src/main/java/org/italiangrid/voms/clients/util/VOMSProxyPathBuilder.java index 3bf7043..a08d21e 100644 --- a/src/main/java/org/italiangrid/voms/clients/util/VOMSProxyPathBuilder.java +++ b/src/main/java/org/italiangrid/voms/clients/util/VOMSProxyPathBuilder.java @@ -16,11 +16,12 @@ package org.italiangrid.voms.clients.util; import org.italiangrid.voms.credential.ProxyNamingPolicy; +import org.italiangrid.voms.credential.impl.DefaultLoadCredentialsStrategy; import org.italiangrid.voms.credential.impl.DefaultProxyPathBuilder; public class VOMSProxyPathBuilder { - private static final String TMP_PATH = "/tmp"; + private static final String TMP_PATH = System.getProperty(DefaultLoadCredentialsStrategy.TMPDIR_PROPERTY); public static String buildProxyPath(){ From ff4e5b0b0268b31a69f64723c94719f3f188b935 Mon Sep 17 00:00:00 2001 From: Lionel Schwarz Date: Tue, 25 Nov 2014 14:13:47 +0100 Subject: [PATCH 2/2] do not build default proxyPath if provided --- .../impl/DefaultVOMSProxyInitBehaviour.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java b/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java index 3a52f91..92296c7 100644 --- a/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java +++ b/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java @@ -405,15 +405,16 @@ private void createProxy(ProxyInitParams params, List proxyCreationWarnings = new ArrayList(); - String proxyFilePath = VOMSProxyPathBuilder.buildProxyPath(); - - String envProxyPath = System.getenv(VOMSEnvironmentVariables.X509_USER_PROXY); - - if (envProxyPath != null) - proxyFilePath = envProxyPath; - - if (params.getGeneratedProxyFile() != null) - proxyFilePath = params.getGeneratedProxyFile(); + String proxyFilePath = null; + if (params.getGeneratedProxyFile() != null) { + proxyFilePath = params.getGeneratedProxyFile(); + } else { + String envProxyPath = System.getenv(VOMSEnvironmentVariables.X509_USER_PROXY); + if (envProxyPath != null) + proxyFilePath = envProxyPath; + else + proxyFilePath = VOMSProxyPathBuilder.buildProxyPath(); + } ProxyCertificateOptions proxyOptions = new ProxyCertificateOptions(credential.getCertificateChain());