141 lines
6.8 KiB
Diff
141 lines
6.8 KiB
Diff
diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java
|
|
--- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java 2016-09-09 12:06:42.000000000 +0200
|
|
+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java 2018-01-05 16:06:00.586887063 +0100
|
|
@@ -31,7 +31,7 @@
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
import org.bouncycastle.asn1.x509.AttributeCertificate;
|
|
-import org.bouncycastle.openssl.PasswordFinder;
|
|
+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
|
|
import org.italiangrid.voms.VOMSError;
|
|
import org.italiangrid.voms.VOMSValidators;
|
|
import org.italiangrid.voms.ac.VOMSACValidator;
|
|
@@ -590,7 +590,7 @@
|
|
|
|
private X509Credential lookupCredential(ProxyInitParams params) {
|
|
|
|
- PasswordFinder pf = null;
|
|
+ PasswordSupplier pf = null;
|
|
|
|
if (params.isReadPasswordFromStdin())
|
|
pf = PasswordFinders.getNoPromptInputStreamPasswordFinder(System.in,
|
|
diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java
|
|
--- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java 2016-09-09 12:06:42.000000000 +0200
|
|
+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java 2018-01-05 16:06:00.587887052 +0100
|
|
@@ -15,7 +15,7 @@
|
|
*/
|
|
package org.italiangrid.voms.clients.impl;
|
|
|
|
-import org.bouncycastle.openssl.PasswordFinder;
|
|
+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
|
|
import org.italiangrid.voms.clients.util.VOMSProxyPathBuilder;
|
|
import org.italiangrid.voms.credential.LoadCredentialsEventListener;
|
|
import org.italiangrid.voms.credential.impl.AbstractLoadCredentialsStrategy;
|
|
@@ -39,7 +39,7 @@
|
|
}
|
|
|
|
@Override
|
|
- public X509Credential loadCredentials(PasswordFinder passwordFinder) {
|
|
+ public X509Credential loadCredentials(PasswordSupplier passwordFinder) {
|
|
|
|
if (proxyFile == null) {
|
|
String envProxyPath = System.getenv(X509_USER_PROXY);
|
|
diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java
|
|
--- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java 2016-09-09 12:06:42.000000000 +0200
|
|
+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java 2018-01-05 16:06:00.587887052 +0100
|
|
@@ -15,7 +15,7 @@
|
|
*/
|
|
package org.italiangrid.voms.clients.impl;
|
|
|
|
-import org.bouncycastle.openssl.PasswordFinder;
|
|
+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
|
|
import org.italiangrid.voms.credential.LoadCredentialsEventListener;
|
|
import org.italiangrid.voms.credential.impl.AbstractLoadCredentialsStrategy;
|
|
|
|
@@ -44,7 +44,7 @@
|
|
}
|
|
|
|
@Override
|
|
- public X509Credential loadCredentials(PasswordFinder passwordFinder) {
|
|
+ public X509Credential loadCredentials(PasswordSupplier passwordFinder) {
|
|
|
|
if (pkcs12File != null)
|
|
return loadPKCS12Credential(pkcs12File, passwordFinder);
|
|
diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java
|
|
--- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java 2016-09-09 12:06:42.000000000 +0200
|
|
+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java 2018-01-05 16:06:00.583887096 +0100
|
|
@@ -17,7 +17,7 @@
|
|
|
|
import java.io.Console;
|
|
|
|
-import org.bouncycastle.openssl.PasswordFinder;
|
|
+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
|
|
import org.italiangrid.voms.VOMSError;
|
|
|
|
/**
|
|
@@ -25,7 +25,7 @@
|
|
* @author andreaceccanti
|
|
*
|
|
*/
|
|
-public class ConsolePasswordFinder implements PasswordFinder {
|
|
+public class ConsolePasswordFinder implements PasswordSupplier {
|
|
|
|
private String promptMessage;
|
|
|
|
diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java
|
|
--- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java 2016-09-09 12:06:42.000000000 +0200
|
|
+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java 2018-01-05 16:06:00.584887085 +0100
|
|
@@ -22,10 +22,10 @@
|
|
import java.io.OutputStream;
|
|
import java.io.PrintStream;
|
|
|
|
-import org.bouncycastle.openssl.PasswordFinder;
|
|
+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
|
|
import org.italiangrid.voms.VOMSError;
|
|
|
|
-public class InputStreamPasswordFinder implements PasswordFinder {
|
|
+public class InputStreamPasswordFinder implements PasswordSupplier {
|
|
|
|
InputStream is;
|
|
PrintStream os;
|
|
diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java
|
|
--- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java 2016-09-09 12:06:42.000000000 +0200
|
|
+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java 2018-01-05 16:06:00.584887085 +0100
|
|
@@ -18,13 +18,13 @@
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
|
|
-import org.bouncycastle.openssl.PasswordFinder;
|
|
+import eu.emi.security.authn.x509.helpers.PasswordSupplier;
|
|
|
|
public class PasswordFinders {
|
|
|
|
public static final String PROMPT_MESSAGE = "Enter GRID pass phrase for this identity:";
|
|
|
|
- public static PasswordFinder getDefault() {
|
|
+ public static PasswordSupplier getDefault() {
|
|
|
|
if (System.console() != null)
|
|
return new ConsolePasswordFinder(PROMPT_MESSAGE);
|
|
@@ -32,18 +32,18 @@
|
|
return new InputStreamPasswordFinder(PROMPT_MESSAGE, System.in, System.out);
|
|
}
|
|
|
|
- public static PasswordFinder getConsolePasswordFinder() {
|
|
+ public static PasswordSupplier getConsolePasswordFinder() {
|
|
|
|
return new ConsolePasswordFinder(PROMPT_MESSAGE);
|
|
}
|
|
|
|
- public static PasswordFinder getInputStreamPasswordFinder(InputStream is,
|
|
+ public static PasswordSupplier getInputStreamPasswordFinder(InputStream is,
|
|
OutputStream os) {
|
|
|
|
return new InputStreamPasswordFinder(PROMPT_MESSAGE, is, os);
|
|
}
|
|
|
|
- public static PasswordFinder getNoPromptInputStreamPasswordFinder(
|
|
+ public static PasswordSupplier getNoPromptInputStreamPasswordFinder(
|
|
InputStream is, OutputStream os) {
|
|
|
|
return new InputStreamPasswordFinder(null, is, os);
|