diff --git a/pom.xml b/pom.xml index 641ed59..64c5a4b 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ true - com.jamesquinley.init + com.jamesquinley.Main diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index 86eb789..668c8f8 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -15,15 +15,10 @@ import org.bson.Document; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.List; import java.util.Random; -import java.util.UUID; import static com.jamesquinley.Asecure.electronicMailHandler.*; import static com.jamesquinley.Asecure.secureCalls.accountMigrationComplete; @@ -38,44 +33,43 @@ public class delegationServices { static MongoCollection dCollection; static MongoDatabase RGFilterDB; static MongoCollection RGFilter; - public static void connectionInit (Boolean beta) - { - //TODO Send Server Version As Standard. - if (beta == true) - { - scReadconnectionString = new ConnectionString("mongodb+srv://serverClientBeta:Unz6c3I0wjrUVBIf@delegationrequest.qnvfa.mongodb.net/mDelegationRequest?retryWrites=true&w=majority"); - //connects to database that beta clients can use. - System.out.println("This is a beta server build (and will only work on that type)"); - scReadsettings = MongoClientSettings.builder() - .applyConnectionString(scReadconnectionString) - .applyToSocketSettings(builder -> - builder.connectTimeout(5, SECONDS) - .readTimeout(6, SECONDS)) - .build(); - dClient = MongoClients.create(scReadsettings); - dClientDatabase = dClient.getDatabase("DelegationRequest"); - dCollection = dClientDatabase.getCollection("accountRequestBeta"); - RGFilterDB = dClient.getDatabase("rgcon"); - RGFilter = RGFilterDB.getCollection("blocked"); - } else - { - scReadconnectionString = new ConnectionString("mongodb+srv://serverClient:x2sJ8Qu0VVMifNLX@accountdelegation.n06hb.mongodb.net/DelegationRequest?retryWrites=true&w=majority"); - //connects to database that production clients can use - System.out.println("This is a production server build (and will only work on that type)"); - scReadsettings = MongoClientSettings.builder() - .applyConnectionString(scReadconnectionString) - .applyToSocketSettings(builder -> - builder.connectTimeout(5, SECONDS) - .readTimeout(6, SECONDS)) - .build(); - dClient = MongoClients.create(scReadsettings); - dClientDatabase = dClient.getDatabase("DelegationRequest"); - dCollection = dClientDatabase.getCollection("accountRequest"); - RGFilterDB = dClient.getDatabase("rgcon"); - RGFilter = RGFilterDB.getCollection("blocked"); - } - } -//TODO get switcher working, NPE currently triggers on post init, move below code block into if statement, or outside of it so it will do the same thing regardless of t/f switch output + + public static void connectionInit(Boolean beta) { + //TODO Send Server Version As Standard. + if (beta == true) { + scReadconnectionString = new ConnectionString("mongodb+srv://serverClientBeta:Unz6c3I0wjrUVBIf@delegationrequest.qnvfa.mongodb.net/mDelegationRequest?retryWrites=true&w=majority"); + //connects to database that beta clients can use. + System.out.println("This is a beta server build (and will only work on that type)"); + scReadsettings = MongoClientSettings.builder() + .applyConnectionString(scReadconnectionString) + .applyToSocketSettings(builder -> + builder.connectTimeout(5, SECONDS) + .readTimeout(6, SECONDS)) + .build(); + dClient = MongoClients.create(scReadsettings); + dClientDatabase = dClient.getDatabase("DelegationRequest"); + dCollection = dClientDatabase.getCollection("accountRequestBeta"); + RGFilterDB = dClient.getDatabase("rgcon"); + RGFilter = RGFilterDB.getCollection("blocked"); + } else { + scReadconnectionString = new ConnectionString("mongodb+srv://serverClient:x2sJ8Qu0VVMifNLX@accountdelegation.n06hb.mongodb.net/DelegationRequest?retryWrites=true&w=majority"); + //connects to database that production clients can use + System.out.println("This is a production server build (and will only work on that type)"); + scReadsettings = MongoClientSettings.builder() + .applyConnectionString(scReadconnectionString) + .applyToSocketSettings(builder -> + builder.connectTimeout(5, SECONDS) + .readTimeout(6, SECONDS)) + .build(); + dClient = MongoClients.create(scReadsettings); + dClientDatabase = dClient.getDatabase("DelegationRequest"); + dCollection = dClientDatabase.getCollection("accountRequest"); + RGFilterDB = dClient.getDatabase("rgcon"); + RGFilter = RGFilterDB.getCollection("blocked"); + } + } + + //TODO get switcher working, NPE currently triggers on post init, move below code block into if statement, or outside of it so it will do the same thing regardless of t/f switch output static ConnectionString AccountCon = new ConnectionString("mongodb+srv://DelegationServerClient:UNxldb8abSJkWscG@account.ufgrh.mongodb.net/account?retryWrites=true&w=majority"); static MongoClientSettings AccountSettings = MongoClientSettings.builder() .applyConnectionString(AccountCon) @@ -92,13 +86,12 @@ public class delegationServices { public static String lastNet = null; public static String Macid = null; - public static void banUserID(String UUID) - { + public static void banUserID(String UUID) { BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("UUID", UUID); BasicDBObject updateQuery2 = new BasicDBObject(); updateQuery2.append("$set", - new BasicDBObject().append("Status",false)); + new BasicDBObject().append("Status", false)); accountS.updateOne(searchQuery, updateQuery2); } @@ -106,8 +99,7 @@ public class delegationServices { Document Filter; int ClientID = 0; Document Lrequest = dCollection.find(eq("status", false)).first(); - if ((boolean) Lrequest.get("status") == true) - { + if ((boolean) Lrequest.get("status") == true) { System.out.println("This request was completed, ignoring"); @@ -120,7 +112,7 @@ public class delegationServices { delegationTimer.DeleteTargetRequest(ClientID); } try { - Macid = (String) Lrequest.get("net"); + Macid = (String) Lrequest.get("net"); } catch (Exception exrp) { System.out.println("Failed To Get MacAdr"); @@ -128,12 +120,10 @@ public class delegationServices { } String RG = (String) Lrequest.get("rg"); - Filter = RGFilter.find(eq("rgkey", "UAROCKS")).first(); + Filter = RGFilter.find(eq("rgkey", "UAROCKS")).first(); String blockedRG = (String) Filter.get("rgflag"); - if ((Boolean)Filter.get("serviceState") == false) - { - if ((Boolean)Filter.get("serviceTermination") == true) - { + if ((Boolean) Filter.get("serviceState") == false) { + if ((Boolean) Filter.get("serviceTermination") == true) { BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("rid", Lrequest.get("rid")); @@ -143,15 +133,14 @@ public class delegationServices { updateQuery.append("$set", new BasicDBObject().append("type", 60)); updateQuery2.append("$set", - new BasicDBObject().append("dn",Filter.get("serviceTerminationNotes"))); + new BasicDBObject().append("dn", Filter.get("serviceTerminationNotes"))); updateQuery1.append("$set", new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery2); dCollection.updateOne(searchQuery, updateQuery1); delegationTimer.DeleteTargetRequest(ClientID); - } else - { + } else { BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("rid", Lrequest.get("rid")); @@ -161,7 +150,7 @@ public class delegationServices { updateQuery.append("$set", new BasicDBObject().append("type", 52)); updateQuery2.append("$set", - new BasicDBObject().append("dn",Filter.get("deniedmsg"))); + new BasicDBObject().append("dn", Filter.get("deniedmsg"))); updateQuery1.append("$set", new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); @@ -461,8 +450,8 @@ public class delegationServices { } if (requesttype == 2) { System.out.println("Login Request (USR&PASS)"); - String username = (String) Lrequest.get("User"); - String password = (String) Lrequest.get("Password"); + String username = (String) Lrequest.get("User"); + String password = (String) Lrequest.get("Password"); Document accountServer; String Password; int Token; @@ -479,66 +468,63 @@ public class delegationServices { Email = (String) accountServer.get("Email"); if (accountServer.get("Status").equals(true)) { if (accountServer.get("Version").equals("1")) { - try { - accountKeyStatus = accountServer.getBoolean("keyStatus"); - } catch (Exception NPE) - { - System.out.println("Assuming False Due To Variable Not Existing For User."); - accountKeyStatus = false; - } - if (accountKeyStatus == false ) { - System.out.println(accountKeyStatus); - String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456789"; - StringBuilder sb = new StringBuilder(); - Random random = new Random(); - int length = 15; - for (int i = 0; i < length; i++) { - int index = random.nextInt(alphabet.length()); - char randomChar = alphabet.charAt(index); - sb.append(randomChar); + try { + accountKeyStatus = accountServer.getBoolean("keyStatus"); + } catch (Exception NPE) { + System.out.println("Assuming False Due To Variable Not Existing For User."); + accountKeyStatus = false; + } + if (accountKeyStatus == false) { + System.out.println(accountKeyStatus); + String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456789"; + StringBuilder sb = new StringBuilder(); + Random random = new Random(); + int length = 15; + for (int i = 0; i < length; i++) { + int index = random.nextInt(alphabet.length()); + char randomChar = alphabet.charAt(index); + sb.append(randomChar); + } + String OTK = sb.toString(); + BasicDBObject searchQuery = new BasicDBObject(); + BasicDBObject keyApplicationIndex = new BasicDBObject(); + searchQuery.append("clientid", ClientID); + keyApplicationIndex.append("User", username); + secureCalls.oneTimeKeyEmail(((String) accountServer.get("Email")), OTK, username); + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + BasicDBObject keyApply = new BasicDBObject(); + BasicDBObject keyAccountState = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 53)); + updateQuery1.append("$set", + new BasicDBObject().append("status", true)); + keyAccountState.append("$set", + new BasicDBObject().append("keyStatus", true)); + keyApply.append("$set", + new BasicDBObject().append("tempKey", OTK)); + accountS.updateOne(keyApplicationIndex, keyApply); + accountS.updateOne(keyApplicationIndex, keyAccountState); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery1); + accountKeyStatus = true; + } else { + System.out.println("RS1"); + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("clientid", ClientID); + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 53)); + updateQuery1.append("$set", + new BasicDBObject().append("status", true)); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery1); + //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); } - String OTK = sb.toString(); - BasicDBObject searchQuery = new BasicDBObject(); - BasicDBObject keyApplicationIndex = new BasicDBObject(); - searchQuery.append("clientid", ClientID); - keyApplicationIndex.append("User", username); - secureCalls.oneTimeKeyEmail(((String) accountServer.get("Email")), OTK, username); - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery1 = new BasicDBObject(); - BasicDBObject keyApply = new BasicDBObject(); - BasicDBObject keyAccountState = new BasicDBObject(); - updateQuery.append("$set", - new BasicDBObject().append("type", 53)); - updateQuery1.append("$set", - new BasicDBObject().append("status", true)); - keyAccountState.append("$set", - new BasicDBObject().append("keyStatus", true)); - keyApply.append("$set", - new BasicDBObject().append("tempKey", OTK)); - accountS.updateOne(keyApplicationIndex, keyApply); - accountS.updateOne(keyApplicationIndex, keyAccountState); - dCollection.updateOne(searchQuery, updateQuery); - dCollection.updateOne(searchQuery, updateQuery1); - accountKeyStatus = true; - } else { - System.out.println("RS1"); - BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("clientid", ClientID); - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery1 = new BasicDBObject(); - updateQuery.append("$set", - new BasicDBObject().append("type", 53)); - updateQuery1.append("$set", - new BasicDBObject().append("status", true)); - dCollection.updateOne(searchQuery, updateQuery); - dCollection.updateOne(searchQuery, updateQuery1); - //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); - } - } - else - { + } else { System.out.println("RSC"); if (Password.equals(password)) { System.out.println("R3c"); @@ -622,7 +608,7 @@ public class delegationServices { delegationTimer.DeleteTargetRequest(ClientID); } } catch (Exception ERC) { - System.out.println("Something Went Wrong: " + ERC.getLocalizedMessage()); + System.out.println("Something Went Wrong: " + ERC.getLocalizedMessage()); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); @@ -644,24 +630,22 @@ public class delegationServices { String userKey = (String) Lrequest.get("otk"); String userName = (String) Lrequest.get("recoverUser"); String serverUserName; - userKey = userKey.toUpperCase(); - System.out.println(userKey); + userKey = userKey.toUpperCase(); + System.out.println(userKey); Document accountServer; try { accountServer = accountS.find(eq("tempKey", userKey)).first(); serverUserName = (String) accountServer.get("User"); - if (accountServer.get("Status").equals(true)) - { - if (userName.equalsIgnoreCase(serverUserName)) - { - System.out.println("This key is correct."); + if (accountServer.get("Status").equals(true)) { + if (userName.equalsIgnoreCase(serverUserName)) { + System.out.println("This key is correct."); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject(); updateQuery.append("$set", - new BasicDBObject().append("type",55)); + new BasicDBObject().append("type", 55)); updateQuery1.append("$set", new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); @@ -669,9 +653,7 @@ public class delegationServices { //delegationTimer.trigger(); delegationTimer.DeleteTargetRequest(ClientID); - } - else - { + } else { System.out.println("This key is incorrect"); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); @@ -679,7 +661,7 @@ public class delegationServices { BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject(); updateQuery.append("$set", - new BasicDBObject().append("type",56)); + new BasicDBObject().append("type", 56)); updateQuery1.append("$set", new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); @@ -696,7 +678,7 @@ public class delegationServices { BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject(); updateQuery.append("$set", - new BasicDBObject().append("type",56)); + new BasicDBObject().append("type", 56)); updateQuery1.append("$set", new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); @@ -705,97 +687,94 @@ public class delegationServices { } } - if (requesttype == 57) - { + if (requesttype == 57) { System.out.println("Verifying email with account tied to OTK"); - try { - String userKey = (String) Lrequest.get("otk"); - String requestedPassword = (String) Lrequest.get("paw"); - String email = (String) Lrequest.get("email"); - String serverEmail; - userKey = userKey.toUpperCase(); - Document accountServer; - accountServer = accountS.find(eq("tempKey", userKey)).first(); - serverEmail = (String) accountServer.get("Email"); - String userName = (String) accountServer.get("User"); - String serverKey = (String) accountServer.get("tempKey"); - System.out.println("Requested Password Hash: " + requestedPassword); - System.out.println("Email Stored On Server: " + serverEmail); - System.out.println("Email from client: " + email); - System.out.println("otk stored on server: " + serverKey); - System.out.println("otk from client: " + userKey); - if (email.equalsIgnoreCase(serverEmail) && userKey.equals(serverKey)) { - System.out.println("All Matching, lets go!"); - BasicDBObject searchQuery = new BasicDBObject(); - BasicDBObject searchQuery1 = new BasicDBObject(); - searchQuery.append("Email", serverEmail); - searchQuery1.append("clientid", ClientID); - System.out.println("Send indexes are ready."); - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery1 = new BasicDBObject(); - BasicDBObject updateQuery2 = new BasicDBObject(); - BasicDBObject updateQuery3 = new BasicDBObject(); - System.out.println("Objects are ready."); - updateQuery.append("$set", - new BasicDBObject().append("Password",requestedPassword)); - updateQuery1.append("$unset", - new BasicDBObject().append("tempKey", "")); - updateQuery2.append("$set", - new BasicDBObject().append("Version","2")); - updateQuery3.append("$set", - new BasicDBObject().append("keyStatus",false)); - System.out.println("Objects set"); - accountS.updateOne(searchQuery, updateQuery); - accountS.updateOne(searchQuery, updateQuery1); - accountS.updateOne(searchQuery, updateQuery2); - accountS.updateOne(searchQuery, updateQuery3); - System.out.println("Objects send"); - BasicDBObject closeRequestType = new BasicDBObject(); - BasicDBObject finalizeRequest = new BasicDBObject(); - System.out.println("Objects close init"); - closeRequestType.append("$set", - new BasicDBObject().append("type",58)); - finalizeRequest.append("$set", - new BasicDBObject().append("status", true)); - dCollection.updateOne(searchQuery1, closeRequestType); - dCollection.updateOne(searchQuery1, finalizeRequest); - System.out.println("Objects close send"); - delegationTimer.DeleteTargetRequest(ClientID); - System.out.println("request finished correctly"); - accountMigrationComplete(serverEmail, userName); - } - else - { - System.out.println("request denied"); - BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("clientid", ClientID); + try { + String userKey = (String) Lrequest.get("otk"); + String requestedPassword = (String) Lrequest.get("paw"); + String email = (String) Lrequest.get("email"); + String serverEmail; + userKey = userKey.toUpperCase(); + Document accountServer; + accountServer = accountS.find(eq("tempKey", userKey)).first(); + serverEmail = (String) accountServer.get("Email"); + String userName = (String) accountServer.get("User"); + String serverKey = (String) accountServer.get("tempKey"); + System.out.println("Requested Password Hash: " + requestedPassword); + System.out.println("Email Stored On Server: " + serverEmail); + System.out.println("Email from client: " + email); + System.out.println("otk stored on server: " + serverKey); + System.out.println("otk from client: " + userKey); + if (email.equalsIgnoreCase(serverEmail) && userKey.equals(serverKey)) { + System.out.println("All Matching, lets go!"); + BasicDBObject searchQuery = new BasicDBObject(); + BasicDBObject searchQuery1 = new BasicDBObject(); + searchQuery.append("Email", serverEmail); + searchQuery1.append("clientid", ClientID); + System.out.println("Send indexes are ready."); + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + BasicDBObject updateQuery2 = new BasicDBObject(); + BasicDBObject updateQuery3 = new BasicDBObject(); + System.out.println("Objects are ready."); + updateQuery.append("$set", + new BasicDBObject().append("Password", requestedPassword)); + updateQuery1.append("$unset", + new BasicDBObject().append("tempKey", "")); + updateQuery2.append("$set", + new BasicDBObject().append("Version", "2")); + updateQuery3.append("$set", + new BasicDBObject().append("keyStatus", false)); + System.out.println("Objects set"); + accountS.updateOne(searchQuery, updateQuery); + accountS.updateOne(searchQuery, updateQuery1); + accountS.updateOne(searchQuery, updateQuery2); + accountS.updateOne(searchQuery, updateQuery3); + System.out.println("Objects send"); + BasicDBObject closeRequestType = new BasicDBObject(); + BasicDBObject finalizeRequest = new BasicDBObject(); + System.out.println("Objects close init"); + closeRequestType.append("$set", + new BasicDBObject().append("type", 58)); + finalizeRequest.append("$set", + new BasicDBObject().append("status", true)); + dCollection.updateOne(searchQuery1, closeRequestType); + dCollection.updateOne(searchQuery1, finalizeRequest); + System.out.println("Objects close send"); + delegationTimer.DeleteTargetRequest(ClientID); + System.out.println("request finished correctly"); + accountMigrationComplete(serverEmail, userName); + } else { + System.out.println("request denied"); + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("clientid", ClientID); - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery1 = new BasicDBObject(); - updateQuery.append("$set", - new BasicDBObject().append("type",59)); - updateQuery1.append("$set", - new BasicDBObject().append("status", true)); - dCollection.updateOne(searchQuery, updateQuery); - dCollection.updateOne(searchQuery, updateQuery1); - delegationTimer.DeleteTargetRequest(ClientID); - } - } catch (Exception ex) { - System.out.println("Unable to reset password, making that known." + ex); - BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("clientid", ClientID); + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 59)); + updateQuery1.append("$set", + new BasicDBObject().append("status", true)); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); + } + } catch (Exception ex) { + System.out.println("Unable to reset password, making that known." + ex); + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("clientid", ClientID); - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery1 = new BasicDBObject(); - updateQuery.append("$set", - new BasicDBObject().append("type",59)); - updateQuery1.append("$set", - new BasicDBObject().append("status", true)); - dCollection.updateOne(searchQuery, updateQuery); - dCollection.updateOne(searchQuery, updateQuery1); - delegationTimer.DeleteTargetRequest(ClientID); - } - } + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 59)); + updateQuery1.append("$set", + new BasicDBObject().append("status", true)); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); + } + } if (requesttype == 3) { System.out.println("Login Request (TKN)"); int CTOKEN = (int) Lrequest.get("Token"); @@ -917,157 +896,154 @@ public class delegationServices { } } if (requesttype == 18) { - if ((Boolean)Filter.get("gameActive") == true) - { - //Deprecated, a killswitch has been added under rgcon in the field "gameActive" - //TOKEN LOGIN FOR GAME, DOES NOT SEND EMAIL, LAUNCHER WILL NOT USE THIS. - System.out.println("Game Login"); - int CTOKEN = (int) Lrequest.get("Token"); - Document accountServer; - int TKN; - String Password; - String Fname; - String Path; - String UserName; - String Email; - String Uid; - System.out.println("VarInit"); - try { - accountServer = accountS.find(eq("Token", CTOKEN)).first(); - System.out.println("PollServer"); - TKN = (int) accountServer.get("Token"); - System.out.println("TokenPulled"); - if (accountServer.get("Status").equals(true)) { - if (TKN == CTOKEN) { - System.out.println("TokenGood"); - TKN = (int) accountServer.get("Token"); - Password = (String) accountServer.get("Password"); - Fname = (String) accountServer.get("FName"); - Path = (String) accountServer.get("Path"); - Email = (String) accountServer.get("Email"); - // Uid = (String) accountServer.get("Uid"); - UserName = (String) accountServer.get("User"); - System.out.println("GotAccount"); - BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("clientid", ClientID); - Filter = RGFilter.find(eq("rgkey", "UAROCKS")).first(); - String apiV = (String) Filter.get("gameAPI"); - String MOTD = (String) Filter.get("motd"); - System.out.println("ApiGrabbed"); + if ((Boolean) Filter.get("gameActive") == true) { + //Deprecated, a killswitch has been added under rgcon in the field "gameActive" + //TOKEN LOGIN FOR GAME, DOES NOT SEND EMAIL, LAUNCHER WILL NOT USE THIS. + System.out.println("Game Login"); + int CTOKEN = (int) Lrequest.get("Token"); + Document accountServer; + int TKN; + String Password; + String Fname; + String Path; + String UserName; + String Email; + String Uid; + System.out.println("VarInit"); + try { + accountServer = accountS.find(eq("Token", CTOKEN)).first(); + System.out.println("PollServer"); + TKN = (int) accountServer.get("Token"); + System.out.println("TokenPulled"); + if (accountServer.get("Status").equals(true)) { + if (TKN == CTOKEN) { + System.out.println("TokenGood"); + TKN = (int) accountServer.get("Token"); + Password = (String) accountServer.get("Password"); + Fname = (String) accountServer.get("FName"); + Path = (String) accountServer.get("Path"); + Email = (String) accountServer.get("Email"); + // Uid = (String) accountServer.get("Uid"); + UserName = (String) accountServer.get("User"); + System.out.println("GotAccount"); + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("clientid", ClientID); + Filter = RGFilter.find(eq("rgkey", "UAROCKS")).first(); + String apiV = (String) Filter.get("gameAPI"); + String MOTD = (String) Filter.get("motd"); + System.out.println("ApiGrabbed"); - System.out.println("initBasicDBObject"); - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery2 = new BasicDBObject(); - BasicDBObject updateQuery3 = new BasicDBObject(); - BasicDBObject updateQuery4 = new BasicDBObject(); - BasicDBObject updateQuery5 = new BasicDBObject(); - BasicDBObject updateQuery6 = new BasicDBObject(); - BasicDBObject updateQuery7 = new BasicDBObject(); - BasicDBObject updateQuery8 = new BasicDBObject(); - BasicDBObject updateQuery9 = new BasicDBObject(); - BasicDBObject updateQuery10 = new BasicDBObject(); - // BasicDBObject updateQuery11 = new BasicDBObject(); - updateQuery.append("$set", - new BasicDBObject().append("type", 8)); - updateQuery2.append("$set", - new BasicDBObject().append("Fname", Fname)); - updateQuery3.append("$set", - new BasicDBObject().append("Path", Path)); - updateQuery4.append("$set", - new BasicDBObject().append("User", UserName)); - updateQuery5.append("$set", - new BasicDBObject().append("Password", Password)); - updateQuery7.append("$set", - new BasicDBObject().append("Email", Email)); - updateQuery6.append("$set", - new BasicDBObject().append("status", true)); - updateQuery8.append("$set", - new BasicDBObject().append("Token", TKN)); - updateQuery9.append("$set", - new BasicDBObject().append("api", apiV)); - updateQuery10.append("$set", - new BasicDBObject().append("motd", MOTD)); - System.out.println("Sending Info To Forwarding Server"); - dCollection.updateOne(searchQuery, updateQuery); - dCollection.updateOne(searchQuery, updateQuery10); - dCollection.updateOne(searchQuery, updateQuery2); - dCollection.updateOne(searchQuery, updateQuery3); - dCollection.updateOne(searchQuery, updateQuery4); - dCollection.updateOne(searchQuery, updateQuery5); - dCollection.updateOne(searchQuery, updateQuery8); - dCollection.updateOne(searchQuery, updateQuery7); - dCollection.updateOne(searchQuery, updateQuery9); - dCollection.updateOne(searchQuery, updateQuery6); - //delegationTimer.trigger(); - System.out.println("Pushed"); - delegationTimer.DeleteTargetRequest(ClientID); - } else { - System.out.println("Login Failure"); - BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("clientid", ClientID); + System.out.println("initBasicDBObject"); + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery2 = new BasicDBObject(); + BasicDBObject updateQuery3 = new BasicDBObject(); + BasicDBObject updateQuery4 = new BasicDBObject(); + BasicDBObject updateQuery5 = new BasicDBObject(); + BasicDBObject updateQuery6 = new BasicDBObject(); + BasicDBObject updateQuery7 = new BasicDBObject(); + BasicDBObject updateQuery8 = new BasicDBObject(); + BasicDBObject updateQuery9 = new BasicDBObject(); + BasicDBObject updateQuery10 = new BasicDBObject(); + // BasicDBObject updateQuery11 = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 8)); + updateQuery2.append("$set", + new BasicDBObject().append("Fname", Fname)); + updateQuery3.append("$set", + new BasicDBObject().append("Path", Path)); + updateQuery4.append("$set", + new BasicDBObject().append("User", UserName)); + updateQuery5.append("$set", + new BasicDBObject().append("Password", Password)); + updateQuery7.append("$set", + new BasicDBObject().append("Email", Email)); + updateQuery6.append("$set", + new BasicDBObject().append("status", true)); + updateQuery8.append("$set", + new BasicDBObject().append("Token", TKN)); + updateQuery9.append("$set", + new BasicDBObject().append("api", apiV)); + updateQuery10.append("$set", + new BasicDBObject().append("motd", MOTD)); + System.out.println("Sending Info To Forwarding Server"); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery10); + dCollection.updateOne(searchQuery, updateQuery2); + dCollection.updateOne(searchQuery, updateQuery3); + dCollection.updateOne(searchQuery, updateQuery4); + dCollection.updateOne(searchQuery, updateQuery5); + dCollection.updateOne(searchQuery, updateQuery8); + dCollection.updateOne(searchQuery, updateQuery7); + dCollection.updateOne(searchQuery, updateQuery9); + dCollection.updateOne(searchQuery, updateQuery6); + //delegationTimer.trigger(); + System.out.println("Pushed"); + delegationTimer.DeleteTargetRequest(ClientID); + } else { + System.out.println("Login Failure"); + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("clientid", ClientID); - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery1 = new BasicDBObject(); - updateQuery.append("$set", - new BasicDBObject().append("type", 9)); - updateQuery1.append("$set", - new BasicDBObject().append("status", true)); - dCollection.updateOne(searchQuery, updateQuery); - dCollection.updateOne(searchQuery, updateQuery1); - //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 9)); + updateQuery1.append("$set", + new BasicDBObject().append("status", true)); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery1); + //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); - } - } else { - System.out.println("Banned Account"); - BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("clientid", ClientID); + } + } else { + System.out.println("Banned Account"); + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("clientid", ClientID); - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery1 = new BasicDBObject(); - updateQuery.append("$set", - new BasicDBObject().append("type", 11)); - updateQuery1.append("$set", - new BasicDBObject().append("status", true)); - dCollection.updateOne(searchQuery, updateQuery); - dCollection.updateOne(searchQuery, updateQuery1); - delegationTimer.DeleteTargetRequest(ClientID); - } - } catch (MongoCommandException ERC) { - System.out.println("Mongodb Error " + ERC); - BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("clientid", ClientID); + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 11)); + updateQuery1.append("$set", + new BasicDBObject().append("status", true)); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); + } + } catch (MongoCommandException ERC) { + System.out.println("Mongodb Error " + ERC); + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("clientid", ClientID); - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery1 = new BasicDBObject(); - updateQuery.append("$set", - new BasicDBObject().append("type", 7)); - updateQuery1.append("$set", - new BasicDBObject().append("status", true)); - dCollection.updateOne(searchQuery, updateQuery); - dCollection.updateOne(searchQuery, updateQuery1); - delegationTimer.DeleteTargetRequest(ClientID); - //delegationTimer.trigger(); - } - } - else - { - System.out.println("Login rejected, game client EOS has been reached."); - BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("clientid", ClientID); + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 7)); + updateQuery1.append("$set", + new BasicDBObject().append("status", true)); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); + //delegationTimer.trigger(); + } + } else { + System.out.println("Login rejected, game client EOS has been reached."); + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("clientid", ClientID); - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery1 = new BasicDBObject(); - updateQuery.append("$set", - new BasicDBObject().append("type", 7)); - updateQuery1.append("$set", - new BasicDBObject().append("status", true)); - dCollection.updateOne(searchQuery, updateQuery); - dCollection.updateOne(searchQuery, updateQuery1); - //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); - } + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 7)); + updateQuery1.append("$set", + new BasicDBObject().append("status", true)); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery1); + //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); + } } if (requesttype == 10) { @@ -1139,7 +1115,7 @@ public class delegationServices { Boolean UUIDOPEN = false; while (UUIDOPEN == false) { length = 40; - sb = new StringBuilder(); + sb = new StringBuilder(); for (int i = 0; i < length; i++) { int index = random.nextInt(source.length()); char randomChar = source.charAt(index); @@ -1159,7 +1135,7 @@ public class delegationServices { sb.append(randomChar); } UUIDGEN = sb.toString(); - UUID = UUIDGEN; + UUID = UUIDGEN; } catch (Exception exDr) { UUIDOPEN = true; System.out.println("UUID Free (While EXP)" + exDr); @@ -1185,14 +1161,14 @@ public class delegationServices { createForm.append("UUID", UUID); createForm.append("Control", 1); createForm.append("Upgrade", 0); - createForm.append("Version","2"); + createForm.append("Version", "2"); createForm.append("keyStatus", false); //createForm.append("Uid",uid); createForm.append("lastNet", Macid); accountS.insertOne(createForm); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); - electronicMailHandler.Onboarding(Email, User,UUID); + electronicMailHandler.Onboarding(Email, User, UUID); BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject(); updateQuery.append("$set", @@ -1203,7 +1179,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery1); System.out.println("Update Request With Finished Status"); delegationTimer.DeleteTargetRequest(ClientID); - } + } } } @@ -1382,27 +1358,22 @@ public class delegationServices { //delegationTimer.trigger(); } } - if (requesttype == 14) - { + if (requesttype == 14) { //TODO Finish making a secure deletion process. String requestClientUUID = (String) Lrequest.get("UUID"); String requestClientToken = (String) Lrequest.get("token"); String requestClientMAC = (String) Lrequest.get("mac"); } - if (requesttype == 61) - { + if (requesttype == 61) { BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); System.out.println("Init ClientTraceback"); String policyDocument; - try - { - policyDocument = Files.readString(Path.of(System.getProperty("user.home") + "/ocs/policy/launcher/legal/eula.txt")); - } - catch (Exception EXR) - { - System.out.println("Unable to pull file, fallback."); - policyDocument = "Policy file does not exist on server. This is an issue on our end. Error ID: " + EXR; + try { + policyDocument = Files.readString(Path.of(System.getProperty("user.home") + "/ocs/policy/launcher/legal/eula.txt")); + } catch (Exception EXR) { + System.out.println("Unable to pull file, fallback."); + policyDocument = "Policy file does not exist on server. This is an issue on our end. Error ID: " + EXR; } BasicDBObject updateQuery = new BasicDBObject(); @@ -1419,19 +1390,15 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery3); delegationTimer.DeleteTargetRequest(ClientID); } - if (requesttype == 63) - { + if (requesttype == 63) { BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); System.out.println("Init ClientTraceback"); String policyDocument; - try - { - // File homedir = new File(System.getProperty("user.home")); - policyDocument = Files.readString(Path.of(System.getProperty("user.home") + "/ocs/policy/launcher/legal/eula.txt")); - } - catch (Exception EXR) - { + try { + // File homedir = new File(System.getProperty("user.home")); + policyDocument = Files.readString(Path.of(System.getProperty("user.home") + "/ocs/policy/launcher/legal/eula.txt")); + } catch (Exception EXR) { System.out.println("Unable to pull file, fallback."); policyDocument = "Policy file does not exist on server. This is an issue on our end. Error ID: " + EXR; } @@ -1450,22 +1417,21 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery3); delegationTimer.DeleteTargetRequest(ClientID); } - if (requesttype == 65) - { + if (requesttype == 65) { BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); - System.out.println("Collecting Error Data"); - File homedir = new File(System.getProperty("user.home")); - String applicationName = Lrequest.get("applicationName").toString(); - String bugType = Lrequest.get("bugType").toString(); - String bugDetails = Lrequest.get("bugDetails").toString(); - String bugSeverity = Lrequest.get("bugSeverity").toString(); - String timeCurrent = LocalDateTime.now().toString(); //ISO-8601: yyyy-MM-ddTHH:mm:ss.S + System.out.println("Collecting Error Data"); + File homedir = new File(System.getProperty("user.home")); + String applicationName = Lrequest.get("applicationName").toString(); + String bugType = Lrequest.get("bugType").toString(); + String bugDetails = Lrequest.get("bugDetails").toString(); + String bugSeverity = Lrequest.get("bugSeverity").toString(); + String timeCurrent = LocalDateTime.now().toString(); //ISO-8601: yyyy-MM-ddTHH:mm:ss.S try { - File myObj = new File(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent +".txt"); + File myObj = new File(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent + ".txt"); if (myObj.createNewFile()) { System.out.println("Log File created: " + myObj.getName()); - FileWriter writer = new FileWriter(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent +".txt", true); + FileWriter writer = new FileWriter(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent + ".txt", true); writer.write("This bug report is for: " + applicationName); writer.write("\r\n"); writer.write("The bug severity is level: " + bugSeverity); @@ -1489,10 +1455,9 @@ public class delegationServices { updateQuery.append("$set", new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); - delegationServices.TargetDelete(ClientID); + delegationServices.TargetDelete(ClientID); } - if (requesttype == 66) - { + if (requesttype == 66) { BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); System.out.println("Collecting Error Data"); @@ -1504,10 +1469,10 @@ public class delegationServices { String bugLog = Lrequest.get("bugLog").toString(); String timeCurrent = LocalDateTime.now().toString(); //ISO-8601: yyyy-MM-ddTHH:mm:ss.S try { - File myObj = new File(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent +".txt"); + File myObj = new File(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent + ".txt"); if (myObj.createNewFile()) { System.out.println("Log File created: " + myObj.getName()); - FileWriter writer = new FileWriter(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent +".txt", true); + FileWriter writer = new FileWriter(homedir + "/ocs/logs/" + applicationName + bugDetails + timeCurrent + ".txt", true); writer.write("This bug report is for: " + applicationName); writer.write("\r\n"); writer.write("The bug severity is level: " + bugSeverity); @@ -1546,10 +1511,8 @@ public class delegationServices { try { accountServer = accountS.find(eq("delOTK", userKey)).first(); serverUUID = (String) accountServer.get("UUID"); - if (accountServer.get("Status").equals(true)) - { - if (clientUUID.equalsIgnoreCase(serverUUID)) - { + if (accountServer.get("Status").equals(true)) { + if (clientUUID.equalsIgnoreCase(serverUUID)) { System.out.println("This key is correct."); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); @@ -1557,18 +1520,16 @@ public class delegationServices { BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject(); updateQuery.append("$set", - new BasicDBObject().append("type",69)); + new BasicDBObject().append("type", 69)); updateQuery1.append("$set", new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); - offBoarding((String)accountServer.get("Email"), (String)accountServer.get("User"), (String)accountServer.get("FName")); + offBoarding((String) accountServer.get("Email"), (String) accountServer.get("User"), (String) accountServer.get("FName")); delegationTimer.DeleteTargetRequest(ClientID); accountS.deleteOne(accountServer); - } - else - { + } else { System.out.println("This key is incorrect"); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); @@ -1576,7 +1537,7 @@ public class delegationServices { BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject(); updateQuery.append("$set", - new BasicDBObject().append("type",70)); + new BasicDBObject().append("type", 70)); updateQuery1.append("$set", new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); @@ -1593,7 +1554,7 @@ public class delegationServices { BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject(); updateQuery.append("$set", - new BasicDBObject().append("type",56)); + new BasicDBObject().append("type", 56)); updateQuery1.append("$set", new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); @@ -1602,47 +1563,42 @@ public class delegationServices { } } - if (requesttype == 67) - { + if (requesttype == 67) { String OTK = "keyNotSetDueToError(ERR24)"; Boolean keyStatus = false; //default false, since will be set to true if the mesurement exists on linked account String accountUUID = (String) Lrequest.get("uuid"); Document linkedAccount = accountS.find(eq("UUID", accountUUID)).first(); try { - keyStatus = (boolean)linkedAccount.get("delStatus"); - } catch (Exception NPE) - { + keyStatus = (boolean) linkedAccount.get("delStatus"); + } catch (Exception NPE) { keyStatus = false; } - if (keyStatus == false) - { - String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456789"; - StringBuilder sb = new StringBuilder(); - Random random = new Random(); - int length = 15; - for (int i = 0; i < length; i++) { - int index = random.nextInt(alphabet.length()); - char randomChar = alphabet.charAt(index); - sb.append(randomChar); - } - OTK = sb.toString(); - BasicDBObject deleteKey = new BasicDBObject(); - BasicDBObject deleteKeyStatus = new BasicDBObject(); - BasicDBObject deleteTie = new BasicDBObject(); - deleteTie.append("UUID", accountUUID); - deleteKey.append("$set", - new BasicDBObject().append("delOTK",OTK)); - deleteKeyStatus.append("$set", - new BasicDBObject().append("delStatus",true)); - accountS.updateOne(deleteTie, deleteKey); - accountS.updateOne(deleteTie, deleteKeyStatus); - otkDeletionEmail((String)linkedAccount.get("Email"),OTK,(String)linkedAccount.get("User")); - } - else - { - otkDeletionEmailResend((String)linkedAccount.get("Email"),(String)linkedAccount.get("delOTK"),(String)linkedAccount.get("User")); - } + if (keyStatus == false) { + String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456789"; + StringBuilder sb = new StringBuilder(); + Random random = new Random(); + int length = 15; + for (int i = 0; i < length; i++) { + int index = random.nextInt(alphabet.length()); + char randomChar = alphabet.charAt(index); + sb.append(randomChar); + } + OTK = sb.toString(); + BasicDBObject deleteKey = new BasicDBObject(); + BasicDBObject deleteKeyStatus = new BasicDBObject(); + BasicDBObject deleteTie = new BasicDBObject(); + deleteTie.append("UUID", accountUUID); + deleteKey.append("$set", + new BasicDBObject().append("delOTK", OTK)); + deleteKeyStatus.append("$set", + new BasicDBObject().append("delStatus", true)); + accountS.updateOne(deleteTie, deleteKey); + accountS.updateOne(deleteTie, deleteKeyStatus); + otkDeletionEmail((String) linkedAccount.get("Email"), OTK, (String) linkedAccount.get("User")); + } else { + otkDeletionEmailResend((String) linkedAccount.get("Email"), (String) linkedAccount.get("delOTK"), (String) linkedAccount.get("User")); + } BasicDBObject clearCL = new BasicDBObject(); clearCL.append("clientid", ClientID); BasicDBObject clearUO = new BasicDBObject(); @@ -1676,34 +1632,34 @@ public class delegationServices { } } } - } catch (Exception Erp) { - System.out.println("Malformed Request, Non Recoverable ErrorInfo: " +Erp); - BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("clientid", ClientID); + } catch (Exception Erp) { + System.out.println("Malformed Request, Non Recoverable ErrorInfo: " + Erp); + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("clientid", ClientID); - BasicDBObject updateQuery = new BasicDBObject(); - BasicDBObject updateQuery1 = new BasicDBObject(); - updateQuery.append("$set", - new BasicDBObject().append("type", 7)); - updateQuery1.append("$set", - new BasicDBObject().append("status", true)); - updateQuery1.append("$set", - new BasicDBObject().append("pos", "934")); - Lrequest.append("status",true); - dCollection.updateOne(searchQuery, updateQuery1); - dCollection.updateOne(searchQuery, updateQuery); - dCollection.updateOne(searchQuery,updateQuery); - delegationTimer.DeleteTargetRequest(ClientID); - } + BasicDBObject updateQuery = new BasicDBObject(); + BasicDBObject updateQuery1 = new BasicDBObject(); + updateQuery.append("$set", + new BasicDBObject().append("type", 7)); + updateQuery1.append("$set", + new BasicDBObject().append("status", true)); + updateQuery1.append("$set", + new BasicDBObject().append("pos", "934")); + Lrequest.append("status", true); + dCollection.updateOne(searchQuery, updateQuery1); + dCollection.updateOne(searchQuery, updateQuery); + dCollection.updateOne(searchQuery, updateQuery); + delegationTimer.DeleteTargetRequest(ClientID); } - + } //above is finding one request and starting wheels //delegationTimer.trigger(); delegate(); } - public static void Purge () { + + public static void Purge() { BasicDBObject searchQueryT = new BasicDBObject(); BasicDBObject searchQueryF = new BasicDBObject(); searchQueryT.append("status", true); @@ -1713,31 +1669,34 @@ public class delegationServices { System.out.println("Flushed Server"); } - public static void TargetDelete (int CID) { + public static void TargetDelete(int CID) { BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("clientid",CID); + searchQuery.append("clientid", CID); dCollection.deleteMany(searchQuery); System.out.println("Flushed a targeted request (CID) from the server"); } - public static void TargetDeleteRID (int CID) { + public static void TargetDeleteRID(int CID) { BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("rid",CID); + searchQuery.append("rid", CID); dCollection.deleteMany(searchQuery); System.out.println("Flushed a targeted request (RID) from the server"); - } public static void delegate () - { - userAuthetication(); - } - public static void userAuthetication (){ - try { - delegationProcesser(); - } catch (Exception exr) { - delegationTimer.trigger(); - } + } + + public static void delegate() { + userAuthetication(); + } + + public static void userAuthetication() { + try { + delegationProcesser(); + } catch (Exception exr) { + delegationTimer.trigger(); + //Shit is so janky, I tell it not to crash when it wants to crash } } +} diff --git a/src/main/java/com/jamesquinley/init.java b/src/main/java/com/jamesquinley/Main.java similarity index 97% rename from src/main/java/com/jamesquinley/init.java rename to src/main/java/com/jamesquinley/Main.java index 1361e1f..705cf45 100644 --- a/src/main/java/com/jamesquinley/init.java +++ b/src/main/java/com/jamesquinley/Main.java @@ -6,7 +6,7 @@ import com.jamesquinley.DelegationServices.status; Hey there! This is the source code for AOTSK-Delegation Server, self explanitory. Also this is multi line so I can justify using this type of comment. */ -public class init +public class Main { public static void main( String[] args ) { diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF index 252cfef..e0904b9 100644 --- a/src/main/resources/META-INF/MANIFEST.MF +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: com.jamesquinley.init +Main-Class: com.jamesquinley.Main