Skip to content

Commit 0207865

Browse files
author
Luigi Zuccarelli
committed
Added JNDI keystore support for key pairs
1 parent 084ce85 commit 0207865

18 files changed

+138
-36
lines changed

‎README.md

+3-7
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ The folder test-keystore is used for testing and should not be used for any prod
3636

3737
```
3838
curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X POST -d '{"controller":"com.microlib.controller.JwtService" , "action":"getToken"}' http://localhost:9000
39-
curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X POST -d '{"controller":"com.microlib.controller.JwtService" , "action":"createAndSignToken", "key-id":"test-keystore"}' http://localhost:9000
40-
curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X POST -d '{"controller":"com.microlib.controller.JwtService" , "action":"verifyToken", "key-id":"test-keystore" , "token": "eyJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJhdXRoMCJ9.gF-JDds389H5l4tk2o7qpuSIzSAEgjfVwTb7c3Tf1InuD7EWk5gjY4kKPP__MGc39HfOobjqUMsUFAJBAJYOJxKmfLMBCLr5TXMMeLcc3-qZw3NZ0DDhq76yLiVA_P3pBm1k-kKtZQvwRY8VrLN9JfBm0BDy3f2wvNRmDXQLHAU33fi4zACpGcTJ9TfNBoY84sOGUBhd73yxPLr4lBhYrFjcqGboZDNzg2LdisTVP1I_9KlHA4d8-H5LHYOcwiFD-hFZteKl52jslKfNucHgrhn0D1iLf4YiE92yNVobLAkVN_qPG8ZX8sNlA5AahIqKenk6hK_C0f1LTGzc6ZxXMA"}' http://localhost:9000
39+
curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X POST -d '{"controller":"com.microlib.controller.JwtService" , "action":"createAndSignToken", "key-id":"test"}' http://localhost:9000
40+
curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X POST -d '{"controller":"com.microlib.controller.JwtService" , "action":"verifyToken", "key-id":"test" , "token": "eyJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJhdXRoMCJ9.gF-JDds389H5l4tk2o7qpuSIzSAEgjfVwTb7c3Tf1InuD7EWk5gjY4kKPP__MGc39HfOobjqUMsUFAJBAJYOJxKmfLMBCLr5TXMMeLcc3-qZw3NZ0DDhq76yLiVA_P3pBm1k-kKtZQvwRY8VrLN9JfBm0BDy3f2wvNRmDXQLHAU33fi4zACpGcTJ9TfNBoY84sOGUBhd73yxPLr4lBhYrFjcqGboZDNzg2LdisTVP1I_9KlHA4d8-H5LHYOcwiFD-hFZteKl52jslKfNucHgrhn0D1iLf4YiE92yNVobLAkVN_qPG8ZX8sNlA5AahIqKenk6hK_C0f1LTGzc6ZxXMA"}' http://localhost:9000
4141
42-
```
43-
44-
## Improvements
45-
46-
Read all key pairs into memory at server startup
42+
```

‎test-keystore/private_key.der renamed to ‎app-keystore/demoapp/private_key.der

File renamed without changes.

‎test-keystore/public_key.der renamed to ‎app-keystore/demoapp/public_key.der

File renamed without changes.

‎app-keystore/mongodb/private_key.der

1.19 KB
Binary file not shown.

‎app-keystore/mongodb/public_key.der

294 Bytes
Binary file not shown.

‎test-keystore/app.rsa renamed to ‎app-keystore/test/app.rsa

File renamed without changes.

‎test-keystore/app.rsa.pub renamed to ‎app-keystore/test/app.rsa.pub

File renamed without changes.

‎app-keystore/test/private_key.der

1.19 KB
Binary file not shown.

‎test-keystore/private_key.pem renamed to ‎app-keystore/test/private_key.pem

File renamed without changes.

‎app-keystore/test/public_key.der

294 Bytes
Binary file not shown.

‎app-keystore/usermanager/private_key.der

1.19 KB
Binary file not shown.

‎app-keystore/usermanager/public_key.der

294 Bytes
Binary file not shown.

‎make.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,24 @@ function usage() {
2626
function clean() {
2727
rm -rf classes/com/*
2828
echo "Task : [clean] completed"
29-
echo " "
29+
echo " "
3030
}
3131

3232
function compile() {
33-
find src/ -name \*.java -print > file.list
33+
find src/ -name \*.java -print > file.list
3434
javac -g -d classes -cp $CP @file.list
3535
echo "Task : [compile] completed"
3636
cp src/com/microlib/server/*.properties classes/com/microlib/server/
3737
cp src/com/microlib/jndi/service/*.properties classes/com/microlib/jndi/service/
3838
cp src/*.properties classes/
3939
echo "Task : [copying resources] completed"
40-
echo " "
40+
echo " "
4141
}
4242

4343
function run() {
4444
java -cp $CP com.microlib.server.TheServer 9000 100
4545
echo "Task : [run] completed"
46-
echo " "
46+
echo " "
4747
}
4848

4949

‎src/com/microlib/controller/JwtService.java

+49-22
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,30 @@
33
import com.auth0.jwt.*;
44
import com.auth0.jwt.algorithms.*;
55
import com.auth0.jwt.exceptions.*;
6-
import java.nio.file.*;
7-
import java.io.*;
86
import java.security.*;
97
import java.security.spec.*;
108
import java.security.interfaces.*;
119
import org.apache.commons.logging.*;
1210
import org.apache.commons.logging.impl.*;
13-
import java.util.Map;
1411
import java.util.List;
12+
import java.util.Map;
13+
import java.util.Hashtable;
14+
import javax.naming.Context;
15+
import javax.naming.InitialContext;
1516
import com.microlib.dataformat.*;
17+
import com.microlib.jndi.service.*;
18+
import java.io.UnsupportedEncodingException;
19+
import javax.naming.NamingException;
1620

1721
public class JwtService implements ExecInterface {
1822

1923
int nLoop = 0;
2024
private boolean bRunning = false;
2125
private String name;
2226
private static org.apache.commons.logging.Log log;
27+
final static String jndiName = "java/KeyStore";
28+
private KeyPairStoreImpl keyStore;
29+
2330

2431
public boolean isRunning() {
2532
return bRunning;
@@ -56,36 +63,48 @@ public String doProcess(Map<String, Object> map) {
5663
// create a token with our generated private rsa key
5764
// use the key-id to retrieve the correct kea
5865
if (null == map.get("key-id")) {
66+
log.error("no key-id found ");
5967
response = json.message("ERROR no key-id found ", "KO");
6068
} else {
61-
byte[] keyBytes = Files.readAllBytes(new File(map.get("key-id").toString() + "/private_key.der").toPath());
62-
PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes);
63-
KeyFactory kf = KeyFactory.getInstance("RSA");
64-
RSAPrivateKey key = (RSAPrivateKey) kf.generatePrivate(spec);
65-
String token = JWT.create().withIssuer("auth0").sign(Algorithm.RSA256(key));
66-
log.info("Signed Token : " + token);
67-
response = json.message("Signed Token " + token, "OK");
69+
byte[] keyBytes = keyStore.getPrivateByteArray(map.get("key-id").toString());
70+
if (null == keyBytes) {
71+
log.error("key-id " + map.get("key-id").toString() + " not found");
72+
response = json.message("ERROR key-id " + map.get("key-id").toString() + " not found ", "KO");
73+
} else {
74+
PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes);
75+
KeyFactory kf = KeyFactory.getInstance("RSA");
76+
RSAPrivateKey key = (RSAPrivateKey) kf.generatePrivate(spec);
77+
String token = JWT.create().withIssuer("auth0").sign(Algorithm.RSA256(key));
78+
log.info("Signed Token : " + token);
79+
response = json.message("Signed Token " + token, "OK");
80+
}
6881
}
69-
} catch (JWTCreationException | IOException | NoSuchAlgorithmException | InvalidKeySpecException exception) {
82+
} catch (JWTCreationException | NoSuchAlgorithmException | InvalidKeySpecException exception) {
7083
log.error(exception);
7184
response = json.message("ERROR " + exception.toString(), "KO");
7285
}
7386
} else if (map.get("action").toString().equals("verifyToken")) {
7487
try {
7588
if (null == map.get("key-id")) {
89+
log.error("no key-id found ");
7690
response = json.message("ERROR no key-id found ", "KO");
7791
} else {
78-
byte[] keyBytes = Files.readAllBytes(new File(map.get("key-id").toString() + "/public_key.der").toPath());
79-
X509EncodedKeySpec spec = new X509EncodedKeySpec(keyBytes);
80-
KeyFactory kf = KeyFactory.getInstance("RSA");
81-
RSAPublicKey key = (RSAPublicKey) kf.generatePublic(spec);
82-
String token = map.get("token").toString();
83-
JWTVerifier verifier = JWT.require(Algorithm.RSA256(key)).withIssuer("auth0").build();
84-
JWT jwt = (JWT) verifier.verify(token);
85-
log.info("Token verified " + jwt);
86-
response = json.message("Token verified ", "OK");
92+
byte[] keyBytes = keyStore.getPublicByteArray(map.get("key-id").toString());
93+
if (null == keyBytes) {
94+
log.error("key-id " + map.get("key-id").toString() + " not found");
95+
response = json.message("ERROR key-id " + map.get("key-id").toString() + " not found ", "KO");
96+
} else {
97+
X509EncodedKeySpec spec = new X509EncodedKeySpec(keyBytes);
98+
KeyFactory kf = KeyFactory.getInstance("RSA");
99+
RSAPublicKey key = (RSAPublicKey) kf.generatePublic(spec);
100+
String token = map.get("token").toString();
101+
JWTVerifier verifier = JWT.require(Algorithm.RSA256(key)).withIssuer("auth0").build();
102+
JWT jwt = (JWT) verifier.verify(token);
103+
log.info("Token verified " + jwt);
104+
response = json.message("Token verified ", "OK");
105+
}
87106
}
88-
} catch (JWTVerificationException | JWTCreationException | IOException | NoSuchAlgorithmException
107+
} catch (JWTVerificationException | JWTCreationException | NoSuchAlgorithmException
89108
| InvalidKeySpecException exception) {
90109
log.error(exception);
91110
response = json.message("ERROR " + exception.toString(), "KO");
@@ -97,6 +116,14 @@ public String doProcess(Map<String, Object> map) {
97116
}
98117

99118
public void init(String sIn) {
100-
log = LogFactory.getLog(JwtService.class);
119+
try {
120+
log = LogFactory.getLog(JwtService.class);
121+
Hashtable<String, String> ht = new Hashtable<String, String>();
122+
ht.put("java.naming.factory.initial", "com.microlib.jndi.DSInitCtxFactory");
123+
Context ctx = new InitialContext(ht);
124+
keyStore = (KeyPairStoreImpl) ctx.lookup(jndiName);
125+
} catch(NamingException e) {
126+
// we can't assume that the log is available
127+
}
101128
}
102129
}

‎src/com/microlib/jndi/service/JndiInterface.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @author: Luigi Mario Zuccarelli
99
* @version: 1.10
1010
* @date: Generated on Mon Dec 29 15:30:20 CEST 2014
11-
* @file: PluginInterface.java
11+
* @file: JndiInterface.java
1212
*
1313
*/
1414

‎src/com/microlib/jndi/service/KeyPairStoreImpl.java

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
package com.microlib.jndi.service;
2+
3+
4+
import org.apache.commons.logging.*;
5+
import org.apache.commons.logging.impl.*;
6+
import java.util.*;
7+
import java.nio.file.*;
8+
import java.io.*;
9+
10+
/**
11+
* @(#) BasicDataSourceImpl
12+
*
13+
* In the light of open source software you are free to do what you like with this code.
14+
* Redistribution and use in source and binary forms, with or without
15+
* modification, is absolutely permitted - just keep the credits please.
16+
*
17+
* @author: Luigi Mario Zuccarelli
18+
* @version: 1.10
19+
* @date: Generated on Mon Dec 29 15:30:20 CEST 2014
20+
* @file: BasicDataSourceImpl.java
21+
*
22+
*
23+
*
24+
* Tags for CVS
25+
* $Author$
26+
* $Id$
27+
* $Date$
28+
*
29+
*/
30+
31+
public class KeyPairStoreImpl implements JndiInterface {
32+
33+
private static org.apache.commons.logging.Log log;
34+
private Map<String, byte[]> publicKeyStore = new HashMap<String, byte[]>();
35+
private Map<String, byte[]> privateKeyStore = new HashMap<String, byte[]>();
36+
37+
public KeyPairStoreImpl() {
38+
log = LogFactory.getLog(KeyPairStoreImpl.class);
39+
}
40+
41+
public void init(String sIn) {
42+
43+
try {
44+
File[] directories = new File("app-keystore").listFiles(File::isDirectory);
45+
for (File f : directories) {
46+
log.info("Loading keypair for " + f.getName());
47+
privateKeyStore.put(f.getName(), Files.readAllBytes(new File(f.getPath() + "/private_key.der").toPath()));
48+
publicKeyStore.put(f.getName(), Files.readAllBytes(new File(f.getPath() + "/public_key.der").toPath()));
49+
}
50+
} catch (IOException io) {
51+
log.error(io);
52+
}
53+
}
54+
55+
public byte[] getPrivateByteArray(String sIn) {
56+
return privateKeyStore.get(sIn);
57+
}
58+
59+
public byte[] getPublicByteArray(String sIn) {
60+
return publicKeyStore.get(sIn);
61+
}
62+
63+
public void destroy() {
64+
try {
65+
log.info(" ");
66+
privateKeyStore = null;
67+
publicKeyStore = null;
68+
} catch (Exception e) {
69+
log.error(e);
70+
} finally {
71+
log = null;
72+
}
73+
}
74+
}

‎src/com/microlib/server/TheServer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public TheServer(int port, int threads) {
9393
log.info(" ");
9494
log.info("Press CTRL-C to gracefully shutdown the server ");
9595
log.info(" ");
96+
log.info(" ");
9697

9798
while (!bStop) {
9899
Socket socket = listener.accept();
@@ -128,5 +129,4 @@ public void run() {
128129
}
129130
}
130131
}
131-
132132
}

‎src/com/microlib/server/TheServer.properties

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# plugins [service list]
66

7-
jndiplugin.count=11
7+
jndiplugin.count=12
88

99
# BasicDataSourceImpl
1010
name.0=com.microlib.jndi.service.BasicDataSourceImpl
@@ -71,3 +71,8 @@ use.10=true
7171
value.10=0
7272
jndi.10=java/Scheduler
7373

74+
# KeyPairStoreImpl
75+
name.11=com.microlib.jndi.service.KeyPairStoreImpl
76+
use.11=true
77+
value.11=0
78+
jndi.11=java/KeyStore

0 commit comments

Comments
 (0)