fixes #146 use security.yml for config and remove dup JwtVerifier instance (#147)

Author: stevehu

pom.xml

@@ -110,6 +110,7 @@
 
     <modules>
         <module>rpc-router</module>
+        <module>rpc-security</module>
     </modules>
 
     <dependencyManagement>
@@ -120,6 +121,11 @@
                 <artifactId>rpc-router</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.networknt</groupId>
+                <artifactId>rpc-security</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.networknt</groupId>

…main/java/com/networknt/rpc/Handler.java …ava/com/networknt/rpc/HybridHandler.javarpc-router/src/main/java/com/networknt/rpc/Handler.java renamed to rpc-router/src/main/java/com/networknt/rpc/HybridHandler.java rpc-router/src/main/java/com/networknt/rpc/Handler.java renamed to rpc-router/src/main/java/com/networknt/rpc/HybridHandler.java

@@ -17,7 +17,6 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.config.Config;
-import com.networknt.rpc.router.JsonHandler;
 import com.networknt.schema.JsonSchema;
 import com.networknt.schema.JsonSchemaFactory;
 import com.networknt.schema.SpecVersion;
@@ -38,8 +37,8 @@
  *
  * @author Steve Hu
  */
-public interface Handler {
-    Logger logger = LoggerFactory.getLogger(Handler.class);
+public interface HybridHandler {
+    Logger logger = LoggerFactory.getLogger(HybridHandler.class);
 
     String REQUEST_SUCCESS = "SUC10200";
     String ERROR_NOT_DEFINED = "ERR10042";

rpc-router/src/main/java/com/networknt/rpc/router/AbstractRpcHandler.java

@@ -2,7 +2,7 @@
 
 import com.networknt.handler.LightHttpHandler;
 import com.networknt.httpstring.AttachmentConstants;
-import com.networknt.rpc.Handler;
+import com.networknt.rpc.HybridHandler;
 import com.networknt.utility.Constants;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.StatusCodes;
@@ -36,7 +36,7 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
             setExchangeStatus(exchange, STATUS_HANDLER_NOT_FOUND);
             return;
         }
-        Handler handler = RpcStartupHookProvider.serviceMap.get(serviceId);
+        HybridHandler handler = RpcStartupHookProvider.serviceMap.get(serviceId);
         Map<String, Object> data = (Map<String, Object>)auditInfo.get(Constants.HYBRID_SERVICE_DATA);
         ByteBuffer result = handler.handle(exchange, data);
         if(result == null) {

rpc-router/src/main/java/com/networknt/rpc/router/JsonHandler.java

@@ -3,7 +3,7 @@
 import com.networknt.config.Config;
 import com.networknt.resource.PathResourceProvider;
 import com.networknt.resource.PredicatedHandlersProvider;
-import com.networknt.rpc.Handler;
+import com.networknt.rpc.HybridHandler;
 import com.networknt.server.Server;
 import com.networknt.server.StartupHookProvider;
 import com.networknt.service.SingletonServiceFactory;
@@ -29,7 +29,7 @@ public class RpcStartupHookProvider implements StartupHookProvider {
     static final Logger logger = LoggerFactory.getLogger(RpcStartupHookProvider.class);
     static RpcRouterConfig config;
 
-    public static final Map<String, Handler> serviceMap = new HashMap<>();
+    public static final Map<String, HybridHandler> serviceMap = new HashMap<>();
     public static PathResourceProvider[] pathResourceProviders;
     public static PredicatedHandlersProvider[] predicatedHandlersProviders;
     public RpcStartupHookProvider() {
@@ -57,7 +57,7 @@ public void onStartup() {
             try {
                 Class handler = Class.forName(className);
                 ServiceHandler a = (ServiceHandler)handler.getAnnotation(ServiceHandler.class);
-                serviceMap.put(a.id(), (Handler)handler.getConstructor().newInstance());
+                serviceMap.put(a.id(), (HybridHandler)handler.getConstructor().newInstance());
                 if(logger.isDebugEnabled()) logger.debug("RpcStartupHookProvider add id {} maps to {}",  a.id(), className);
                 if(config.isRegisterService()) Server.serviceIds.add(a.id().replace('/', '.'));
             } catch (Exception e) {

rpc-router/src/main/java/com/networknt/rpc/router/RpcStartupHookProvider.java

@@ -3,9 +3,10 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.networknt.config.Config;
 import com.networknt.config.JsonMapper;
+import com.networknt.handler.Handler;
 import com.networknt.handler.MiddlewareHandler;
 import com.networknt.httpstring.AttachmentConstants;
-import com.networknt.rpc.Handler;
+import com.networknt.rpc.HybridHandler;
 import com.networknt.status.Status;
 import com.networknt.utility.Constants;
 import com.networknt.utility.ModuleRegistry;
@@ -124,7 +125,7 @@ private void processRequest(HttpServerExchange exchange, String message) {
         Map<String, Object> map = JsonMapper.string2Map(message);
         String serviceId = getServiceId(map);
         logger.debug("serviceId = {}", serviceId);
-        Handler handler = RpcStartupHookProvider.serviceMap.get(serviceId);
+        HybridHandler handler = RpcStartupHookProvider.serviceMap.get(serviceId);
         if(handler == null) {
             this.handleMissingHandler(exchange, serviceId);
             return;
@@ -155,10 +156,15 @@ private void processRequest(HttpServerExchange exchange, String message) {
         auditInfo.put(Constants.HYBRID_SERVICE_DATA, data);
         exchange.putAttachment(AttachmentConstants.AUDIT_INFO, auditInfo);
 
-        // if exchange is not ended, then do the processing.
-        ByteBuffer result = handler.handle(exchange, data);
-        if(logger.isDebugEnabled()) logger.debug(result.toString());
-        this.completeExchange(result, exchange);
+        // if exchange is not ended, then call the next handler in the chain.
+        if(logger.isTraceEnabled()) logger.trace("SchemaHandler.handleRequest ends.");
+        try {
+            Handler.next(exchange, next);
+        } catch (Exception e) {
+            logger.error("Exception:", e);
+            exchange.setStatusCode(StatusCodes.INTERNAL_SERVER_ERROR);
+            exchange.endExchange();
+        }
     }
 
     void completeExchange(ByteBuffer result, HttpServerExchange exchange) {

rpc-router/src/main/java/com/networknt/rpc/router/SchemaHandler.java

@@ -1,6 +1,6 @@
 package com.networknt.rpc.router;
 
-import com.networknt.rpc.Handler;
+import com.networknt.rpc.HybridHandler;
 import io.undertow.server.HttpServerExchange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,8 +11,8 @@
  * Created by steve on 12/04/17.
  */
 @ServiceHandler(id="www.networknt.com/account/credit/1.0.0")
-public class AccountServiceHandler implements Handler {
-    static private final Logger logger = LoggerFactory.getLogger(AccountServiceHandler.class);
+public class AccountServiceHybridHandler implements HybridHandler {
+    static private final Logger logger = LoggerFactory.getLogger(AccountServiceHybridHandler.class);
 
     @Override
     public ByteBuffer handle(HttpServerExchange exchange, Object input) {