I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added support for reading certificates from Base64 encoded strings.

Browse Source
This commit is contained in:
dev
2011-06-30 08:05:19 +00:00
parent 7862f7fc8f
commit a3d5cefb3d
3 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/net/i2p/itoopie/i2pcontrol/JSONInterface.java
View File

@ -43,9 +43,9 @@ public class JSONInterface{
int srvPort = _conf.getConf("server-port", 7656); int srvPort = _conf.getConf("server-port", 7656);
String srvTarget = _conf.getConf("server-target", "jsonrpc"); String srvTarget = _conf.getConf("server-target", "jsonrpc");
try { try {
srvURL = new URL("http://"+srvHost+":"+srvPort+"/"+srvTarget); srvURL = new URL("https://"+srvHost+":"+srvPort+"/"+srvTarget);
} catch (MalformedURLException e){ } catch (MalformedURLException e){
_log.error("Bad URL: http://"+srvHost+":"+srvPort+"/"+srvTarget, e); _log.error("Bad URL: https://"+srvHost+":"+srvPort+"/"+srvTarget, e);
} }
session = new JSONRPC2Session(srvURL); session = new JSONRPC2Session(srvURL);
} }
@ -84,7 +84,6 @@ public class JSONInterface{
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static String getEcho(String str) throws JSONRPC2Error{ public static String getEcho(String str) throws JSONRPC2Error{
JSONRPC2Request req = new JSONRPC2Request("echo", incrNonce()); JSONRPC2Request req = new JSONRPC2Request("echo", incrNonce());
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
Map params = new HashMap(); Map params = new HashMap();

34
src/net/i2p/itoopie/security/CertificateHelper.java Normal file
View File

@ -0,0 +1,34 @@
package net.i2p.itoopie.security;
import java.io.ByteArrayInputStream;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
public class CertificateHelper {
private static Log _log;
static {
_log = LogFactory.getLog(CertificateHelper.class);
}
public static X509Certificate certFromBase64(String base64){
try {
CertificateFactory cf = CertificateFactory.getInstance(CertificateManager.DEFAULT_CERT_SPI);
byte[] bytes = Base64.decode(base64);
return (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(bytes));
} catch (CertificateException e) {
_log.fatal("Unable to load service interface provider, " +
CertificateManager.DEFAULT_CERT_SPI +
" used for reading base64 encoded certificates", e);
}
return null;
}
}

2
src/net/i2p/itoopie/security/CertificateManager.java
View File

@ -29,10 +29,10 @@ public class CertificateManager {
private static final String DEFAULT_KEYSTORE_LOCATION = "key.store"; private static final String DEFAULT_KEYSTORE_LOCATION = "key.store";
private static final String DEFAULT_KEYSTORE_PASSWORD = "nut'nfancy"; private static final String DEFAULT_KEYSTORE_PASSWORD = "nut'nfancy";
private static final String DEFAULT_KEYSTORE_ALGORITHM = "SunX509"; private static final String DEFAULT_KEYSTORE_ALGORITHM = "SunX509";
public static final String DEFAULT_CERT_SPI = "X.509";
private static KeyStore _ks; private static KeyStore _ks;
private static Log _log; private static Log _log;
static { static {
_log = LogFactory.getLog(CertificateManager.class); _log = LogFactory.getLog(CertificateManager.class);
} }