Skip to content

Clean and updated libaesc and jwt #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keshwithan wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Clean and updated libaesc and jwt #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d9b0f5
Updated CommunicationFacadeBean.java
keshwithan Aug 26, 2019
fe26449
Updated CommunicationFacade.java
keshwithan Aug 26, 2019
44d1402
Updated TokenProvider.java
keshwithan Aug 26, 2019
27186eb
Updated intel header
keshwithan Aug 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...src/main/java/com/scorelab/ioe/security/communication/facade/api/CommunicationFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ public interface CommunicationFacade {

LinkedHashMap<String, Object> requestNodeConfigs();

String get(String server, String path) throws InvalidResponseException;
String post(String target, String find, LinkedHashMap<String, Object> microservice, LinkedHashMap<String, Object> parameters) throws InvalidResponseException;

String get(String target, String find, LinkedHashMap<String, Object> microservice) throws InvalidResponseException;

String get(String server, String path) throws InvalidResponseException;

String post(String server, String path, LinkedHashMap<String, Object> parameters) throws InvalidResponseException;

String post(String target, String find, LinkedHashMap<String, Object> microservice, LinkedHashMap<String, Object> parameters) throws InvalidResponseException;

String requestKafkaBrokers();
}
33 changes: 18 additions & 15 deletions ...ain/java/com/scorelab/ioe/security/communication/facade/impl/CommunicationFacadeBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,19 @@
import com.scorelab.ioe.security.communication.service.impl.RedisSentinelServiceBean;

public class CommunicationFacadeBean implements CommunicationFacade {


@Override
public String requestKafkaBrokers() {
KafkaBrokersService kafkaBrokersService = new KafkaBrokersServiceBean();
return kafkaBrokersService.requestKafkaBrokers();
public String post(String target, String find, LinkedHashMap<String, Object> microservice, LinkedHashMap<String, Object> parameters) throws InvalidResponseException {
JSONObject service = new JSONObject(post(target, find, microservice));
return post(service.getString("target"), service.getString("path"), parameters);
}

@Override
public String get(String server, String path) throws InvalidResponseException {
GETService getService = new GETServiceBean();
return getService.get(server, path);
}

@Override
public Set<String> requestRedisSentinelsHosts() {
RedisSentinelService redisSentinelService = new RedisSentinelServiceBean();
Expand All @@ -39,26 +46,22 @@ public LinkedHashMap<String, Object> requestNodeConfigs() {
}

@Override
public String get(String server, String path) throws InvalidResponseException {
GETService getService = new GETServiceBean();
return getService.get(server, path);
public String requestKafkaBrokers() {
KafkaBrokersService kafkaBrokersService = new KafkaBrokersServiceBean();
return kafkaBrokersService.requestKafkaBrokers();
}

@Override
public String get(String target, String find, LinkedHashMap<String, Object> microservice) throws InvalidResponseException {
JSONObject service = new JSONObject(post(target, find, microservice));
return get(service.getString("target"), service.getString("path"));
}

@Override
public String post(String server, String path, LinkedHashMap<String, Object> parameters) throws InvalidResponseException {
POSTService postService = new POSTServiceBean();
return postService.post(server, path, parameters);
}



@Override
public String post(String target, String find, LinkedHashMap<String, Object> microservice, LinkedHashMap<String, Object> parameters) throws InvalidResponseException {
public String get(String target, String find, LinkedHashMap<String, Object> microservice) throws InvalidResponseException {
JSONObject service = new JSONObject(post(target, find, microservice));
return post(service.getString("target"), service.getString("path"), parameters);
return get(service.getString("target"), service.getString("path"));
}
}
43 changes: 22 additions & 21 deletions rest_api/src/main/java/com/scorelab/ioe/security/jwt/TokenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,6 @@ public void init() {
1000 * jHipsterProperties.getSecurity().getAuthentication().getJwt().getTokenValidityInSecondsForRememberMe();
}

public String createToken(Authentication authentication, Boolean rememberMe) {
String authorities = authentication.getAuthorities().stream()
.map(authority -> authority.getAuthority())
.collect(Collectors.joining(","));

long now = (new Date()).getTime();
Date validity;
if (rememberMe) {
validity = new Date(now + this.tokenValidityInSecondsForRememberMe);
} else {
validity = new Date(now + this.tokenValidityInSeconds);
}

return Jwts.builder()
.setSubject(authentication.getName())
.claim(AUTHORITIES_KEY, authorities)
.signWith(SignatureAlgorithm.HS512, secretKey)
.setExpiration(validity)
.compact();
}

public Authentication getAuthentication(String token) {
Claims claims = Jwts.parser()
Expand All @@ -82,7 +62,6 @@ public Authentication getAuthentication(String token) {

return new UsernamePasswordAuthenticationToken(principal, "", authorities);
}

public boolean validateToken(String authToken) {
try {
Jwts.parser().setSigningKey(secretKey).parseClaimsJws(authToken);
Expand All @@ -92,4 +71,26 @@ public boolean validateToken(String authToken) {
return false;
}
}

public String createToken(Authentication authentication, Boolean rememberMe) {
String authorities = authentication.getAuthorities().stream()
.map(authority -> authority.getAuthority())
.collect(Collectors.joining(","));

long now = (new Date()).getTime();
Date validity;
if (rememberMe) {
validity = new Date(now + this.tokenValidityInSecondsForRememberMe);
} else {
validity = new Date(now + this.tokenValidityInSeconds);
}

return Jwts.builder()
.setSubject(authentication.getName())
.claim(AUTHORITIES_KEY, authorities)
.signWith(SignatureAlgorithm.HS512, secretKey)
.setExpiration(validity)
.compact();
}

}
31 changes: 18 additions & 13 deletions rest_api/src/main/java/com/scorelab/ioe/security/libaesc/intel-aes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ int intel_aes_decrypt_cbc_256(aes_ctx_t cx, unsigned char *output,
unsigned int inputLen,
unsigned int blocksize);



#define intel_aes_ecb_worker(encrypt, keysize) \
((encrypt) \
? ((keysize) == 16 ? intel_aes_encrypt_ecb_128 : \
Expand All @@ -91,17 +89,6 @@ int intel_aes_decrypt_cbc_256(aes_ctx_t cx, unsigned char *output,
(keysize) == 24 ? intel_aes_decrypt_ecb_192 : \
intel_aes_decrypt_ecb_256))


#define intel_aes_cbc_worker(encrypt, keysize) \
((encrypt) \
? ((keysize) == 16 ? intel_aes_encrypt_cbc_128 : \
(keysize) == 24 ? intel_aes_encrypt_cbc_192 : \
intel_aes_encrypt_cbc_256) \
: ((keysize) == 16 ? intel_aes_decrypt_cbc_128 : \
(keysize) == 24 ? intel_aes_decrypt_cbc_192 : \
intel_aes_decrypt_cbc_256))


#define intel_aes_init(encrypt, keysize, ctx) \
do { \
if (encrypt) { \
Expand All @@ -120,3 +107,21 @@ int intel_aes_decrypt_cbc_256(aes_ctx_t cx, unsigned char *output,
intel_aes_decrypt_init_256(key, ctx->expandedKey); \
} \
} while (0)


void intel_aes_gcmDEC(const unsigned char* CT,
unsigned char* PT,
void *Gctx,
unsigned long len);

#define intel_aes_cbc_worker(encrypt, keysize) \
((encrypt) \
? ((keysize) == 16 ? intel_aes_encrypt_cbc_128 : \
(keysize) == 24 ? intel_aes_encrypt_cbc_192 : \
intel_aes_encrypt_cbc_256) \
: ((keysize) == 16 ? intel_aes_decrypt_cbc_128 : \
(keysize) == 24 ? intel_aes_decrypt_cbc_192 : \
intel_aes_decrypt_cbc_256))



8 changes: 5 additions & 3 deletions rest_api/src/main/java/com/scorelab/ioe/security/libaesc/jcrypto_jni.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,7 @@ JNIEXPORT errno_t JNICALL Java_br_com_dojot_jcrypto_jni_JCrypto_aes_1gcm_1init

/* Check if context is valid */
result = gcmCheckContext(ctx);
if(result != SUCCESSFULL_OPERATION) {
goto FAIL;
}


/* If there is any IV, maps it to C variable */
if(iv_buf != NULL) {
Expand All @@ -151,6 +149,10 @@ JNIEXPORT errno_t JNICALL Java_br_com_dojot_jcrypto_jni_JCrypto_aes_1gcm_1init
goto FAIL;
}

if(result != SUCCESSFULL_OPERATION) {
goto FAIL;
}

FAIL:
if(result != SUCCESSFULL_OPERATION) {
memset(ctx, 0, sizeof(aes_gcm_ctx_st));
Expand Down