From f0cb2c18d6f78f0f5ccf926108dcb9a5ba031558 Mon Sep 17 00:00:00 2001
From: James Quinley <jsquinley@gmail.com>
Date: Sat, 26 Mar 2022 08:47:16 -0700
Subject: [PATCH] Update MACADD Collector

---
 .../delegationServices.java                   | 52 +++++++++++++++++--
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
index ff79440..ea03339 100644
--- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
+++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
@@ -74,6 +74,7 @@ public class delegationServices {
     public static String lastNet = null;
     public static String Macid = null;
     public static void delegationProcesser() {
+        Document Filter;
         int ClientID = 0;
         Document Lrequest = dCollection.find(eq("status", false)).first();
         if ((boolean) Lrequest.get("status") == true)
@@ -86,16 +87,21 @@ public class delegationServices {
             try {
                 try {
                     ClientID = (int) Lrequest.get("clientid");
-                    Macid = (String)  Lrequest.get("net");
                     System.out.println(Macid);
 
                 } catch (Exception exrp) {
-                    System.out.println("Failed To Get Client ID & MacAdr");
+                    delegationTimer.DeleteTargetRequest(ClientID);
+                }
+                try {
+                    Macid = (String)  Lrequest.get("net");
+
+                } catch (Exception exrp) {
+                    System.out.println("Failed To Get MacAdr");
                     delegationTimer.DeleteTargetRequest(ClientID);
                 }
 
                 String RG = (String) Lrequest.get("rg");
-                Document Filter = RGFilter.find(eq("rgkey", "UAROCKS")).first();
+               Filter = RGFilter.find(eq("rgkey", "UAROCKS")).first();
                 String blockedRG = (String) Filter.get("rgflag");
                 if (blockedRG.contains(RG)) {
                     System.out.println("User Is Trying To Join From A Blocked Region, Halted Login Request.");
@@ -120,7 +126,7 @@ public class delegationServices {
 
 
                     System.out.println("Delegation Has Started");
-                    if(requesttype == 0 || requesttype == 1 || requesttype == 2 || requesttype == 3 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype ==7 || requesttype == 8 || requesttype ==9 || requesttype ==10 || requesttype ==11 || requesttype ==12 || requesttype == 20 || requesttype == 21 ) {
+                    if(requesttype == 0 || requesttype == 1 || requesttype == 2 || requesttype == 3 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype ==7 || requesttype == 8 || requesttype ==9 || requesttype ==10 || requesttype ==11 || requesttype ==12 || requesttype == 20 || requesttype == 21 || requesttype == 41) {
                         if (requesttype == 7 || requesttype == 12 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype == 19 || requesttype == 12) {
                             System.out.println("An Excluded Request (7MAL, 12S, 4C, 5C, 6C) Has Been Detected, Ignoring");
                             //Thinking of moving all purge timer call to here to centralize deletion decision.
@@ -859,6 +865,44 @@ public class delegationServices {
                         {
                             //Friends Network Login Goes Here, Fun.
                         }
+                        if (requesttype == 41)
+                        {
+                            System.out.println("Update Request");
+                            BasicDBObject searchQuery = new BasicDBObject();
+                            BasicDBObject SqS = new BasicDBObject();
+                            SqS.append("clientid", ClientID);
+
+                            BasicDBObject updateQuery = new BasicDBObject();
+                            BasicDBObject updateQuery2 = new BasicDBObject();
+                            BasicDBObject updateQuery3 = new BasicDBObject();
+                            BasicDBObject updateQuery4 = new BasicDBObject();
+                            BasicDBObject updateQuery6 = new BasicDBObject();
+                           try
+                           {
+                               updateQuery.append("$set",
+                                       new BasicDBObject().append("type", 42));
+                               updateQuery2.append("$set",
+                                       new BasicDBObject().append("uri",(String)Filter.get("up")));
+                               updateQuery6.append("$set",
+                                       new BasicDBObject().append("status", true));
+                           }
+                           catch (Exception ex)
+                           {
+                               updateQuery.append("$set",
+                                       new BasicDBObject().append("type", 43));
+                               updateQuery2.append("$set",
+                                       new BasicDBObject().append("uri",(String)Filter.get("up")));
+                               updateQuery6.append("$set",
+                                       new BasicDBObject().append("status", true));
+                           }
+                            dCollection.updateOne(SqS, updateQuery);
+                            dCollection.updateOne(SqS,updateQuery2);
+                            dCollection.updateOne(SqS, updateQuery6);
+                            System.out.println("Finished Updater Request");
+                            //delegationTimer.trigger();
+                            delegationTimer.DeleteTargetRequest(ClientID);
+
+                        }
                     } else {
                         System.out.println("Malformed Request, Non Recoverable (Request Type Not Found)");
                         BasicDBObject searchQuery = new BasicDBObject();