nheron/kie-platform
nheron/kie-platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enable/disable kie logging #271

Browse source 
Allow to define a JMT token to give access to a project over reverse proxy #274
Hot deploy management #269 => UI for defiinition
This commit is contained in:
nheron 2021-07-24 22:31:32 +02:00
commit 51fb0e0275
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drools-framework-business-proxy-parent/drools-framework-business-reverse-proxy/src/main/java/org/chtijbug/drools/reverseproxy/mappings/CustomForwardedRequestInterceptor.java
View file

@ -12,7 +12,6 @@ public class CustomForwardedRequestInterceptor implements ForwardedRequestInterc
private static final Logger logger = LoggerFactory.getLogger(CustomForwardedRequestInterceptor.class); private static final Logger logger = LoggerFactory.getLogger(CustomForwardedRequestInterceptor.class);
@Override @Override
public void intercept(RequestData data, MappingProperties mapping) { public void intercept(RequestData data, MappingProperties mapping) {
logger.debug(data.toString()); logger.debug("data forwarded = {}",data);
} }
} }

2
drools-framework-business-proxy-parent/drools-framework-business-reverse-proxy/src/main/java/org/chtijbug/drools/reverseproxy/mappings/CustomReceivedResponseInterceptor.java
View file

@ -12,6 +12,6 @@ public class CustomReceivedResponseInterceptor implements ReceivedResponseInterc
private static final Logger logger = LoggerFactory.getLogger(CustomReceivedResponseInterceptor.class); private static final Logger logger = LoggerFactory.getLogger(CustomReceivedResponseInterceptor.class);
@Override @Override
public void intercept(ResponseData responseData, MappingProperties mappingProperties) { public void intercept(ResponseData responseData, MappingProperties mappingProperties) {
logger.debug(responseData.toString()); logger.debug("data received = {}",responseData);
} }
} }

6
drools-framework-business-proxy-parent/drools-framework-business-reverse-proxy/src/main/java/org/chtijbug/drools/reverseproxy/service/JwtService.java
View file

@ -1,17 +1,11 @@
package org.chtijbug.drools.reverseproxy.service; package org.chtijbug.drools.reverseproxy.service;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.JwtBuilder;
import io.jsonwebtoken.Jwts; import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import org.chtijbug.drools.proxy.persistence.model.ProjectPersist;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.bind.DatatypeConverter; import javax.xml.bind.DatatypeConverter;
import java.security.Key;
import java.util.Date;
@Service @Service
public class JwtService { public class JwtService {

35
drools-framework-business-proxy-parent/drools-framework-business-reverse-proxy/src/main/java/org/chtijbug/drools/reverseproxy/service/UpdateService.java
View file

@ -100,21 +100,26 @@ public class UpdateService {
return null; return null;
} }
private void generateUrlMap(){
Map<String, String> urlMap = new HashMap<>();
List<RuntimePersist> runtimePersists = runtimeRepository.findAll();
for (RuntimePersist runtimePersist : runtimePersists) {
if (!urlMap.containsKey(runtimePersist.getServerName()) ) {
urlMap.put(runtimePersist.getServerName(), runtimePersist.getServerUrl());
runtimes.put(runtimePersist.getServerName(), runtimePersist.duplicate());
}
}
}
private void generateMappings() { private void generateMappings() {
projects.clear(); projects.clear();
mappingPropertiesMap.clear(); mappingPropertiesMap.clear();
List<MappingProperties> paths = new ArrayList<>(); List<MappingProperties> paths = new ArrayList<>();
Collection<ProjectPersist> projectPersists = projectRepository.findAll(); Collection<ProjectPersist> projectPersists = projectRepository.findAll();
Map<String, String> urlMap = new HashMap<>(); generateUrlMap();
List<RuntimePersist> runtimePersists = runtimeRepository.findAll();
for (RuntimePersist runtimePersist : runtimePersists) {
if (urlMap.containsKey(runtimePersist.getServerName()) == false) {
urlMap.put(runtimePersist.getServerName(), runtimePersist.getServerUrl());
runtimes.put(runtimePersist.getServerName(), runtimePersist.duplicate());
}
}
for (ProjectPersist projectPersist : projectPersists) { for (ProjectPersist projectPersist : projectPersists) {
if (projectPersist.getServerNames().size() > 0) { if (!projectPersist.getServerNames().isEmpty()) {
projects.put(projectPersist.getContainerID(), projectPersist.duplicate()); projects.put(projectPersist.getContainerID(), projectPersist.duplicate());
MappingProperties mappingProperties2 = new MappingProperties(); MappingProperties mappingProperties2 = new MappingProperties();
String servList = null; String servList = null;
@ -126,7 +131,9 @@ public class UpdateService {
if (servList == null) { if (servList == null) {
servList = serverName; servList = serverName;
} else { } else {
servList = servList + ":" + serverName; StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(servList).append(":").append(serverName);
servList = stringBuilder.toString();
} }
} }
@ -136,7 +143,7 @@ public class UpdateService {
mappingProperties2.getCustomConfiguration().put("connect", 2000); mappingProperties2.getCustomConfiguration().put("connect", 2000);
mappingProperties2.getCustomConfiguration().put("read", 2000); mappingProperties2.getCustomConfiguration().put("read", 2000);
mappingProperties2.setStripPath(true); mappingProperties2.setStripPath(true);
if (mappingProperties2.getDestinations().size() > 0) { if (!mappingProperties2.getDestinations().isEmpty()) {
if (projectPersist.isUseJWTToConnect()) { if (projectPersist.isUseJWTToConnect()) {
mappingJWTPropertiesMap.put(projectPersist.getUuid(), mappingProperties2); mappingJWTPropertiesMap.put(projectPersist.getUuid(), mappingProperties2);
paths.add(mappingProperties2); paths.add(mappingProperties2);
@ -144,7 +151,7 @@ public class UpdateService {
for (String serverName : mappingProperties2.getDestinations()) { for (String serverName : mappingProperties2.getDestinations()) {
logger.info("---------for uuid {} adding server {} ", projectPersist.getUuid(), serverName); logger.info("---------for uuid {} adding server {} ", projectPersist.getUuid(), serverName);
} }
logger.info("---------Project " + projectPersist.getContainerID() + " defined on servers - " + mappingProperties2.getDestinations().toString()); logger.info("---------Project {}} defined on servers -{} " ,projectPersist.getContainerID(), mappingProperties2.getDestinations());
} else { } else {
mappingPropertiesMap.put(UpdateService.removeSlach(mappingProperties2.getPath()), mappingProperties2); mappingPropertiesMap.put(UpdateService.removeSlach(mappingProperties2.getPath()), mappingProperties2);
@ -153,10 +160,10 @@ public class UpdateService {
for (String serverName : mappingProperties2.getDestinations()) { for (String serverName : mappingProperties2.getDestinations()) {
logger.info("---------for path {} adding server {} ", mappingProperties2.getPath(), serverName); logger.info("---------for path {} adding server {} ", mappingProperties2.getPath(), serverName);
} }
logger.info("---------Project " + projectPersist.getContainerID() + " defined on servers - " + mappingProperties2.getDestinations().toString()); logger.info("---------Project {} defined on servers - {}" ,projectPersist.getContainerID(),mappingProperties2.getDestinations());
} }
} else { } else {
logger.error("Project " + projectPersist.getContainerID() + " defined on non existing server"); logger.error("Project {} defined on non existing server",projectPersist.getContainerID());
} }