#186387666 : Governance rule fix (#120)

* update dependency, add a new route * use new goveranance rule API, update dependency * Updated moesifapi version, Readme and other examples. --------- Co-authored-by: Praveen Kumar <[email protected]>
Moesif · Nov 30, 2023 · ebbb71e · ebbb71e
1 parent 78fbb2d
commit ebbb71e
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,12 +46,8 @@ transaction-logs
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
 .idea/
+.debug
 
 ## File-based project format:
 *.iws

diff --git a/README.md b/README.md
@@ -27,14 +27,14 @@ Add the Moesif dependency to your project's pom.xml file:
 <dependency>
     <groupId>com.moesif.servlet</groupId>
     <artifactId>moesif-servlet</artifactId>
-    <version>1.7.9</version>
+    <version>1.7.10</version>
 </dependency>
 
 <!-- OR for newer Jakarta-->
 <dependency>
     <groupId>com.moesif.servlet</groupId>
     <artifactId>moesif-servlet-jakarta</artifactId>
-    <version>2.0.3</version>
+    <version>2.1.1</version>
 </dependency>
 ```
 

diff --git a/examples-jakarta/spring-boot-starter-example-tomcat/pom.xml b/examples-jakarta/spring-boot-starter-example-tomcat/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.moesif.servlet</groupId>
       <artifactId>moesif-servlet-jakarta</artifactId>
-      <version>2.1.0</version>
+      <version>2.1.1</version>
     </dependency>
   </dependencies>
 

diff --git a/...ng-boot-starter-example-tomcat/src/main/java/com/moesif/servlet/spring/ApiController.java b/...ng-boot-starter-example-tomcat/src/main/java/com/moesif/servlet/spring/ApiController.java
@@ -57,6 +57,11 @@ public String random() {
     return "{\"success\" : true}";
   }
 
+  @GetMapping("gov/multiple_match")
+  public String multiple_match() {
+    return "{\"success\" : true}";
+  }
+
   @RequestMapping("/api/text")
   @ResponseBody
   public String simpleString() {

diff --git a/examples-jakarta/spring-boot-starter-example-undertow/pom.xml b/examples-jakarta/spring-boot-starter-example-undertow/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>com.moesif.servlet</groupId>
 			<artifactId>moesif-servlet-jakarta</artifactId>
-			<version>2.1.0</version>
+			<version>2.1.1</version>
 		</dependency>
 
 		<dependency>

diff --git a/jersey-servlet-example/pom.xml b/jersey-servlet-example/pom.xml
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>com.moesif.servlet</groupId>
             <artifactId>moesif-servlet</artifactId>
-            <version>1.7.9</version>
+            <version>1.7.10</version>
         </dependency>
 
         <dependency>

diff --git a/moesif-servlet-jakarta/README.md b/moesif-servlet-jakarta/README.md
@@ -24,7 +24,7 @@ Add the Moesif dependency to your project's pom.xml file:
 <dependency>
     <groupId>com.moesif.servlet</groupId>
     <artifactId>moesif-servlet-jakarta</artifactId>
-    <version>2.0.3</version>
+    <version>2.1.1</version>
 </dependency>
 ```
 

diff --git a/moesif-servlet-jakarta/pom.xml b/moesif-servlet-jakarta/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.moesif.servlet</groupId>
   <artifactId>moesif-servlet-jakarta</artifactId>
-  <version>2.1.0</version>
+  <version>2.1.1</version>
   <packaging>jar</packaging>
   <name>moesif-servlet-jakarta</name>
   <description>Moesif SDK for Java Servlet to log and analyze API calls using Jakarta</description>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>com.moesif.api</groupId>
       <artifactId>moesifapi</artifactId>
-      <version>1.7.4</version>
+      <version>1.7.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/moesif-servlet-jakarta/src/main/java/com/moesif/servlet/MoesifFilter.java b/moesif-servlet-jakarta/src/main/java/com/moesif/servlet/MoesifFilter.java
@@ -340,8 +340,11 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             config.getMetadata(httpRequest, null)
     );
 
-    if(moesifApi.getAPI().isBlockedByGovernanceRules(event)) {
-      logger.warning("Blocked by governance rules" + event.getBlockedBy());
+    BlockedByGovernanceRulesResponse blockResponse = moesifApi.getAPI().getBlockedByGovernanceRulesResponse(event);
+    if(blockResponse.isBlocked) {
+      logger.warning("Blocked by governance rules" + blockResponse.blockedBy);
+      event.setBlockedBy(blockResponse.blockedBy);
+      event.setResponse(blockResponse.response);
       EventResponseModel responseModel = event.getResponse();
       if (transactionId != null) {
         responseModel.getHeaders().put("X-Moesif-Transaction-Id", transactionId);

diff --git a/moesif-servlet/pom.xml b/moesif-servlet/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.moesif.servlet</groupId>
   <artifactId>moesif-servlet</artifactId>
-  <version>1.7.9</version>
+  <version>1.7.10</version>
   <packaging>jar</packaging>
   <name>moesif-servlet</name>
   <description>Moesif SDK for Java Servlet to log and analyze API calls</description>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>com.moesif.api</groupId>
       <artifactId>moesifapi</artifactId>
-      <version>1.7.4</version>
+      <version>1.7.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/moesif-servlet/src/main/java/com/moesif/servlet/MoesifFilter.java b/moesif-servlet/src/main/java/com/moesif/servlet/MoesifFilter.java
@@ -335,12 +335,15 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             config.getMetadata(httpRequest, null)
     );
 
-    if(moesifApi.getAPI().isBlockedByGovernanceRules(event)) {
+    BlockedByGovernanceRulesResponse blockResponse = moesifApi.getAPI().getBlockedByGovernanceRulesResponse(event);
+    if(blockResponse.isBlocked) {
+      logger.warning("Blocked by governance rules" + blockResponse.blockedBy);
+      event.setBlockedBy(blockResponse.blockedBy);
+      event.setResponse(blockResponse.response);
       EventResponseModel responseModel = event.getResponse();
       if (transactionId != null) {
         responseModel.getHeaders().put("X-Moesif-Transaction-Id", transactionId);
       }
-
       EventModel maskedEvent = config.maskContent(event);
       this.addEventToQueue(maskedEvent);
       Map<String, String> headers = responseModel.getHeaders();

diff --git a/moesif-springrequest/pom.xml b/moesif-springrequest/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.moesif.springrequest</groupId>
   <artifactId>moesif-springrequest</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <packaging>jar</packaging>
   <name>moesif-springrequest</name>
   <description>Moesif SDK for Java to log and analyze outgoing API calls</description>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>com.moesif.api</groupId>
       <artifactId>moesifapi</artifactId>
-      <version>1.7.4</version>
+      <version>1.7.6</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

diff --git a/...-springrequest/src/main/java/com/moesif/springrequest/MoesifSpringRequestInterceptor.java b/...-springrequest/src/main/java/com/moesif/springrequest/MoesifSpringRequestInterceptor.java
@@ -188,8 +188,8 @@ public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttp
                 config.getSessionToken(request, null),
                 config.getMetadata(request, null)
         );
-
-        if (moesifApi.getAPI().isBlockedByGovernanceRules(event)) {
+        BlockedByGovernanceRulesResponse blockResponse = moesifApi.getAPI().getBlockedByGovernanceRulesResponse(event);
+        if (blockResponse.isBlocked) {
             EventResponseModel responseModel = event.getResponse();
             if (!config.skip(request, null)) {
                 EventModel maskedEvent = config.maskContent(event);

diff --git a/servlet-example/pom.xml b/servlet-example/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.moesif.servlet</groupId>
   <artifactId>servlet-example</artifactId>
-  <version>1.4.0</version>
+  <version>1.4.1</version>
   <packaging>war</packaging>
   <name>servlet-example</name>
 
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.moesif.servlet</groupId>
       <artifactId>moesif-servlet</artifactId>
-      <version>1.7.9</version>
+      <version>1.7.10</version>
     </dependency>
   </dependencies>
 

diff --git a/spark-servlet-example/pom.xml b/spark-servlet-example/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>com.moesif.servlet</groupId>
             <artifactId>moesif-servlet</artifactId>
-            <version>1.7.9</version>
+            <version>1.7.10</version>
         </dependency>
         <!--
         <dependency>

diff --git a/spring-boot-servlet-example/pom.xml b/spring-boot-servlet-example/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>com.moesif.servlet</groupId>
       <artifactId>moesif-servlet</artifactId>
-      <version>1.7.9</version>
+      <version>1.7.10</version>
     </dependency>
 
 

diff --git a/spring-boot-starter-example/pom.xml b/spring-boot-starter-example/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>com.moesif.servlet</groupId>
       <artifactId>moesif-servlet</artifactId>
-      <version>1.7.9</version>
+      <version>1.7.10</version>
     </dependency>
   </dependencies>