Fixed server build, this consolidates requests into a general category. Please be mindful of your input data when making requests in the general category.

This commit is contained in:
James Quinley 2023-03-24 22:08:29 -07:00
parent ed0f4fe666
commit 300b21e5cc
2 changed files with 672 additions and 700 deletions

View File

@ -84,17 +84,14 @@ public class electronicMailHandler {
message.setFrom(new InternetAddress(senderEmailId)); message.setFrom(new InternetAddress(senderEmailId));
message.setRecipients(Message.RecipientType.TO, message.setRecipients(Message.RecipientType.TO,
InternetAddress.parse(receiverEmail)); InternetAddress.parse(receiverEmail));
message.setSubject("Obsidian Core Request Denial"); message.setSubject("Obsidian Core Account Message");
message.setText("Hey there, account creation has been disabled.\n" + message.setText("Hey there, account creation has been disabled.\n" +
"We're closing up shop, and we've disabled account creation on the service. Existing accounts will continue to work until service shutdown." + "Due to a technical issue account creation has been disabled, see https://status.obsidiancorestudios.com for more info." +
"\nHave a good day, " + User); "\nHave a good day, " + User);
Transport.send(message); Transport.send(message);
System.out.println("Sent Disabled Account Join Email");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
System.err.println("Email ONBOARD Not sent due to an error");
} }
} }
public static void offBoarding(String receiverEmail, String User, String Name) { public static void offBoarding(String receiverEmail, String User, String Name) {

View File

@ -170,11 +170,10 @@ public class delegationServices {
System.out.println("Got Type, Getting Doc ID"); System.out.println("Got Type, Getting Doc ID");
RequestR = requesttype; RequestR = requesttype;
System.out.println(RG);
System.out.println("Delegation Has Started"); System.out.println("Delegation Has Started");
if (!RG.equals("web") || !RG.equals("chat")) 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 == 14 || requesttype == 20 || requesttype == 21 || requesttype == 41 || requesttype == 18 || requesttype == 47 || requesttype == 48 || requesttype == 54 || requesttype == 57 || requesttype == 61 || requesttype == 63 || requesttype == 65 || requesttype == 66 || requesttype == 67 || requesttype == 68 || requesttype == 71 || requesttype == 72 || requesttype == 73 || requesttype == 74 || requesttype == 75 || requesttype ==78 || requesttype == 79 || requesttype == 81
{ ) {
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 == 14 || requesttype == 20 || requesttype == 21 || requesttype == 41 || requesttype == 18 || requesttype == 47 || requesttype == 48 || requesttype == 54 || requesttype == 57 || requesttype == 61 || requesttype == 63 || requesttype == 65 || requesttype == 66 || requesttype == 67 || requesttype == 68 || requesttype == 71 || requesttype == 72) {
if (requesttype == 47) { if (requesttype == 47) {
System.out.println("Self Updater download Request"); System.out.println("Self Updater download Request");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
@ -1261,7 +1260,8 @@ public class delegationServices {
} else { } else {
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", ClientID); searchQuery.append("_id", ClientID);
secureCalls.accountCreationDisabled(Email, User); try { secureCalls.accountCreationDisabled(Email, User);} catch (Exception ex) {System.out.println("Unable to send disabled msg to user");
}
BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject();
updateQuery.append("$set", updateQuery.append("$set",
@ -1803,10 +1803,126 @@ public class delegationServices {
dCollection.updateOne(clearCL, clearUO); dCollection.updateOne(clearCL, clearUO);
TargetDelete(ClientID); TargetDelete(ClientID);
} }
} else { if (requesttype == 81) {
System.out.println("Malformed Request, Non Recoverable (Request Type Not Found)"); System.out.println("Login Request (TKN)");
String CTOKEN = (String) Lrequest.get("token");
// Document TResolve = dCollection.find(eq("type", 3)).first();
Document accountServer;
String TKN;
String Password;
String Fname;
String Path;
String UserName;
String Email;
String keychainUUID;
String validSession;
try {
accountServer = accountS.find(eq("Token", CTOKEN)).first();
if (!(accountServer == null)) {
TKN = (String) accountServer.get("Token");
validSession = (String) accountServer.get("websession");
if (accountServer.get("Status").equals(true)) {
if (TKN.equals(CTOKEN) && Lrequest.get("sessionID").equals(validSession)) {
TKN = (String) accountServer.get("Token");
Password = (String) accountServer.get("Password");
Fname = (String) accountServer.get("FName");
Path = (String) accountServer.get("Path");
Email = (String) accountServer.get("Email");
UserName = (String) accountServer.get("User");
validSession = (String) accountServer.get("session");
keychainUUID = (String) accountServer.get("UUID");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", ClientID); searchQuery.append("_id", Lrequest.get("_id"));
BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery2 = new BasicDBObject();
BasicDBObject updateQuery3 = new BasicDBObject();
BasicDBObject updateQuery4 = new BasicDBObject();
BasicDBObject updateQuery6 = new BasicDBObject();
BasicDBObject updateQuery7 = new BasicDBObject();
BasicDBObject updateQuery8 = new BasicDBObject();
BasicDBObject updateQuery9 = 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));
updateQuery7.append("$set",
new BasicDBObject().append("Email", Email));
updateQuery8.append("$set",
new BasicDBObject().append("Token", TKN));
updateQuery9.append("$set",
new BasicDBObject().append("keychainUUID", keychainUUID));
updateQuery6.append("$set",
new BasicDBObject().append("status", true));
System.out.println("Sending Info To Forwarding Server");
dCollection.updateOne(searchQuery, updateQuery8);
dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery2);
dCollection.updateOne(searchQuery, updateQuery3);
dCollection.updateOne(searchQuery, updateQuery4);
dCollection.updateOne(searchQuery, updateQuery8);
dCollection.updateOne(searchQuery, updateQuery7);
dCollection.updateOne(searchQuery, updateQuery9);
dCollection.updateOne(searchQuery, updateQuery6);
//delegationTimer.trigger();
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
} else {
System.out.println("Login Failure");
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", Lrequest.get("_id"));
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.DeleteTargetRequestByID(Lrequest.get("_id"));
}
} else {
System.out.println("Banned Account");
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", Lrequest.get("_id"));
BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject();
updateQuery.append("$set",
new BasicDBObject().append("type", 84));
updateQuery1.append("$set",
new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
}
} else {
System.out.println("Login Failure");
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", Lrequest.get("_id"));
BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject();
updateQuery.append("$set",
new BasicDBObject().append("type", 83));
updateQuery1.append("$set",
new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger();
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
}
} catch (MongoCommandException ERC) {
System.out.println("Malformed Request");
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", Lrequest.get("_id"));
BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject();
@ -1814,18 +1930,12 @@ public class delegationServices {
new BasicDBObject().append("type", 7)); new BasicDBObject().append("type", 7));
updateQuery1.append("$set", updateQuery1.append("$set",
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
Lrequest.append("status", true);
dCollection.updateOne(searchQuery, updateQuery1);
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
BasicDBObject clearCL = new BasicDBObject(); dCollection.updateOne(searchQuery, updateQuery1);
clearCL.append("_id", ClientID);
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id")); delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
//delegationTimer.trigger();
}
} }
} else
{
System.out.println("Running in limited mode (Web Request)");
if (requesttype == 73 || requesttype == 74 || requesttype == 75 || requesttype ==78 || requesttype == 79 || requesttype == 81) {
if (requesttype == 73) { if (requesttype == 73) {
System.out.println("Login Request (USR&PASS)"); System.out.println("Login Request (USR&PASS)");
String username = (String) Lrequest.get("user"); String username = (String) Lrequest.get("user");
@ -2358,126 +2468,10 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery3); dCollection.updateOne(searchQuery, updateQuery3);
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id")); delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
} }
if (requesttype == 81) {
System.out.println("Login Request (TKN)");
String CTOKEN = (String) Lrequest.get("token");
// Document TResolve = dCollection.find(eq("type", 3)).first();
Document accountServer;
String TKN;
String Password;
String Fname;
String Path;
String UserName;
String Email;
String keychainUUID;
String validSession;
try {
accountServer = accountS.find(eq("Token", CTOKEN)).first();
if (!(accountServer == null)) {
TKN = (String) accountServer.get("Token");
validSession = (String) accountServer.get("websession");
if (accountServer.get("Status").equals(true)) {
if (TKN.equals(CTOKEN) && Lrequest.get("sessionID").equals(validSession)) {
TKN = (String) accountServer.get("Token");
Password = (String) accountServer.get("Password");
Fname = (String) accountServer.get("FName");
Path = (String) accountServer.get("Path");
Email = (String) accountServer.get("Email");
UserName = (String) accountServer.get("User");
validSession = (String) accountServer.get("session");
keychainUUID = (String) accountServer.get("UUID");
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", Lrequest.get("_id"));
BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery2 = new BasicDBObject();
BasicDBObject updateQuery3 = new BasicDBObject();
BasicDBObject updateQuery4 = new BasicDBObject();
BasicDBObject updateQuery6 = new BasicDBObject();
BasicDBObject updateQuery7 = new BasicDBObject();
BasicDBObject updateQuery8 = new BasicDBObject();
BasicDBObject updateQuery9 = 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));
updateQuery7.append("$set",
new BasicDBObject().append("Email", Email));
updateQuery8.append("$set",
new BasicDBObject().append("Token", TKN));
updateQuery9.append("$set",
new BasicDBObject().append("keychainUUID", keychainUUID));
updateQuery6.append("$set",
new BasicDBObject().append("status", true));
System.out.println("Sending Info To Forwarding Server");
dCollection.updateOne(searchQuery, updateQuery8);
dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery2);
dCollection.updateOne(searchQuery, updateQuery3);
dCollection.updateOne(searchQuery, updateQuery4);
dCollection.updateOne(searchQuery, updateQuery8);
dCollection.updateOne(searchQuery, updateQuery7);
dCollection.updateOne(searchQuery, updateQuery9);
dCollection.updateOne(searchQuery, updateQuery6);
//delegationTimer.trigger();
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
} else { } else {
System.out.println("Login Failure"); System.out.println("Malformed Request, Non Recoverable (Request Type Not Found)");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", Lrequest.get("_id")); searchQuery.append("_id", 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.DeleteTargetRequestByID(Lrequest.get("_id"));
}
} else {
System.out.println("Banned Account");
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", Lrequest.get("_id"));
BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject();
updateQuery.append("$set",
new BasicDBObject().append("type", 84));
updateQuery1.append("$set",
new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
}
} else {
System.out.println("Login Failure");
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", Lrequest.get("_id"));
BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject();
updateQuery.append("$set",
new BasicDBObject().append("type", 83));
updateQuery1.append("$set",
new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger();
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
}
} catch (MongoCommandException ERC) {
System.out.println("Malformed Request");
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", Lrequest.get("_id"));
BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject();
@ -2485,31 +2479,12 @@ public class delegationServices {
new BasicDBObject().append("type", 7)); new BasicDBObject().append("type", 7));
updateQuery1.append("$set", updateQuery1.append("$set",
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
//delegationTimer.trigger();
}
}
} else {
System.out.println("Type does not exist (ERR4)");
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id",Lrequest.get("_id"));
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", "uk"));
Lrequest.append("status", true); Lrequest.append("status", true);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery); BasicDBObject clearCL = new BasicDBObject();
clearCL.append("_id", ClientID);
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id")); delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
}
} }
} }