JamesQ/MatchmakingBackend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This version is now on prod.

Browse Source 
-Removes Path features, will refuse to sync those to old clients, and it has been replaced with an error message
-Path is removed from online api
-Any sync writes that attempt to write path will be shown to complete but will not be saved to the account database.
-IP addresses are not assumed, any client besides the web API not sending them will be given limited features, and some things like: Account Creation, Account Deletion, and Account Migration will be disabled until the user updates the client.
This commit is contained in:
James Quinley 2023-04-27 19:23:36 -07:00
parent 1defede0eb
commit 14a5fe6d72
3 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/jamesquinley/Asecure/electronicMailHandler.java
View File

@ -167,7 +167,7 @@ public class electronicMailHandler {
message.setSubject("Obsidian Core Account Login Notice | " + Date); message.setSubject("Obsidian Core Account Login Notice | " + Date);
message.setText("Something seems fishy, a login was detected at a new location " + Adr +" "+ "(at " + dateFormat.format(dt) + " PST)" + ".\nIf this was you ignore this email, if it wasn't you, please contact us (Respond to this email).\n\n\n\n" + message.setText("Something seems fishy, a login was detected at a new location " + Adr +" "+ "(at " + dateFormat.format(dt) + " PST)" + ".\nIf this was you ignore this email, if it wasn't you, please contact us (Respond to this email).\n\n\n\n" +
"\nThis email (" + receiverEmail + ") is linked to the Obsidian Core account: "+ User + " \nThese security emails can't be opted out of.\n\nThis was sent on behalf of Obsidian Core Studios by our super cool login robots.\n\n\n\n" + "\nThis email (" + receiverEmail + ") is linked to the Obsidian Core account: "+ User + " \nThese security emails can't be opted out of.\n\nThis was sent on behalf of Obsidian Core Studios by our super cool login robots.\n\n\n\n" +
"The MAC address used has been set as your account's default, as well as past logins ("+Adr + ")"); "The IP address used has been set as your account's default, as well as past logins ("+Adr + ")");
Transport.send(message); Transport.send(message);
System.out.println("Alert Sent"); System.out.println("Alert Sent");

34
src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
View File

@ -257,7 +257,6 @@ public class delegationServices {
Document accountServer; Document accountServer;
String Token; String Token;
String Fname; String Fname;
String Path;
String UserName; String UserName;
String Email; String Email;
try { try {
@ -268,7 +267,6 @@ public class delegationServices {
Token = (String) accountServer.get("Token"); Token = (String) accountServer.get("Token");
Fname = (String) accountServer.get("FName"); Fname = (String) accountServer.get("FName");
Path = (String) accountServer.get("Path");
Email = (String) accountServer.get("Email"); Email = (String) accountServer.get("Email");
UserName = (String) accountServer.get("User"); UserName = (String) accountServer.get("User");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
@ -287,7 +285,7 @@ public class delegationServices {
updateQuery2.append("$set", updateQuery2.append("$set",
new BasicDBObject().append("Fname", Fname)); new BasicDBObject().append("Fname", Fname));
updateQuery3.append("$set", updateQuery3.append("$set",
new BasicDBObject().append("Path", Path)); new BasicDBObject().append("Path", "Path has been removed from the service, please update to remove this message."));
updateQuery4.append("$set", updateQuery4.append("$set",
new BasicDBObject().append("User", UserName)); new BasicDBObject().append("User", UserName));
updateQuery7.append("$set", updateQuery7.append("$set",
@ -358,7 +356,6 @@ public class delegationServices {
Document accountServer; Document accountServer;
String Token; String Token;
String Fname; String Fname;
String Path;
String UserName; String UserName;
try { try {
accountServer = accountS.find(eq("Token", CTOKEN)).first(); accountServer = accountS.find(eq("Token", CTOKEN)).first();
@ -367,7 +364,6 @@ public class delegationServices {
if (accountServer.get("Status").equals(true)) { if (accountServer.get("Status").equals(true)) {
if (Token.equals(CTOKEN)) { if (Token.equals(CTOKEN)) {
Token = (String) Lrequest.get("Token"); Token = (String) Lrequest.get("Token");
Path = (String) Lrequest.get("Path");
System.out.println("Got info."); System.out.println("Got info.");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("Token", Token); searchQuery.append("Token", Token);
@ -380,7 +376,7 @@ public class delegationServices {
updateQuery.append("$set", updateQuery.append("$set",
new BasicDBObject().append("type", 12)); new BasicDBObject().append("type", 12));
updateQuery3.append("$set", updateQuery3.append("$set",
new BasicDBObject().append("Path", Path)); new BasicDBObject().append("DummyWriteSyncData", "1"));
updateQuery6.append("$set", updateQuery6.append("$set",
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(SqS, updateQuery); dCollection.updateOne(SqS, updateQuery);
@ -459,7 +455,6 @@ public class delegationServices {
String Password; String Password;
String Token; String Token;
String Fname; String Fname;
String Path;
String UserName; String UserName;
String Email; String Email;
String keychainUUID; String keychainUUID;
@ -533,7 +528,6 @@ public class delegationServices {
System.out.println("R3c"); System.out.println("R3c");
Token = (String) accountServer.get("Token"); Token = (String) accountServer.get("Token");
Fname = (String) accountServer.get("FName"); Fname = (String) accountServer.get("FName");
Path = (String) accountServer.get("Path");
Email = (String) accountServer.get("Email"); Email = (String) accountServer.get("Email");
UserName = (String) accountServer.get("User"); UserName = (String) accountServer.get("User");
lastNet = (String) accountServer.get("lastNet"); lastNet = (String) accountServer.get("lastNet");
@ -560,7 +554,7 @@ public class delegationServices {
updateQuery2.append("$set", updateQuery2.append("$set",
new BasicDBObject().append("Fname", Fname)); new BasicDBObject().append("Fname", Fname));
updateQuery3.append("$set", updateQuery3.append("$set",
new BasicDBObject().append("Path", Path)); new BasicDBObject().append("Path", "Path has been removed from the service, please update to remove this message."));
updateQuery4.append("$set", updateQuery4.append("$set",
new BasicDBObject().append("User", UserName)); new BasicDBObject().append("User", UserName));
updateQuery5.append("$set", updateQuery5.append("$set",
@ -814,7 +808,6 @@ public class delegationServices {
String TKN; String TKN;
String Password; String Password;
String Fname; String Fname;
String Path;
String UserName; String UserName;
String Email; String Email;
String keychainUUID; String keychainUUID;
@ -827,7 +820,6 @@ public class delegationServices {
TKN = (String) accountServer.get("Token"); TKN = (String) accountServer.get("Token");
Password = (String) accountServer.get("Password"); Password = (String) accountServer.get("Password");
Fname = (String) accountServer.get("FName"); Fname = (String) accountServer.get("FName");
Path = (String) accountServer.get("Path");
Email = (String) accountServer.get("Email"); Email = (String) accountServer.get("Email");
UserName = (String) accountServer.get("User"); UserName = (String) accountServer.get("User");
lastNet = (String) accountServer.get("lastNet"); lastNet = (String) accountServer.get("lastNet");
@ -849,7 +841,7 @@ public class delegationServices {
updateQuery2.append("$set", updateQuery2.append("$set",
new BasicDBObject().append("Fname", Fname)); new BasicDBObject().append("Fname", Fname));
updateQuery3.append("$set", updateQuery3.append("$set",
new BasicDBObject().append("Path", Path)); new BasicDBObject().append("Path", "Path has been removed from the service, please update to remove this message."));
updateQuery4.append("$set", updateQuery4.append("$set",
new BasicDBObject().append("User", UserName)); new BasicDBObject().append("User", UserName));
updateQuery7.append("$set", updateQuery7.append("$set",
@ -962,7 +954,6 @@ public class delegationServices {
String TKN; String TKN;
String Password; String Password;
String Fname; String Fname;
String Path;
String UserName; String UserName;
String Email; String Email;
String Uid; String Uid;
@ -978,7 +969,6 @@ public class delegationServices {
TKN = (String) accountServer.get("Token"); TKN = (String) accountServer.get("Token");
Password = (String) accountServer.get("Password"); Password = (String) accountServer.get("Password");
Fname = (String) accountServer.get("FName"); Fname = (String) accountServer.get("FName");
Path = (String) accountServer.get("Path");
Email = (String) accountServer.get("Email"); Email = (String) accountServer.get("Email");
// Uid = (String) accountServer.get("Uid"); // Uid = (String) accountServer.get("Uid");
UserName = (String) accountServer.get("User"); UserName = (String) accountServer.get("User");
@ -1008,7 +998,7 @@ public class delegationServices {
updateQuery2.append("$set", updateQuery2.append("$set",
new BasicDBObject().append("Fname", Fname)); new BasicDBObject().append("Fname", Fname));
updateQuery3.append("$set", updateQuery3.append("$set",
new BasicDBObject().append("Path", Path)); new BasicDBObject().append("Path", "API_DENY_PATHFETCH"));
updateQuery4.append("$set", updateQuery4.append("$set",
new BasicDBObject().append("User", UserName)); new BasicDBObject().append("User", UserName));
updateQuery5.append("$set", updateQuery5.append("$set",
@ -1230,7 +1220,6 @@ public class delegationServices {
createForm.append("Email", Email); createForm.append("Email", Email);
createForm.append("FName", FName); createForm.append("FName", FName);
createForm.append("Entitlements", "NA"); createForm.append("Entitlements", "NA");
createForm.append("Path", "C:\\ObsidianCoreStudios\\Application\\");
createForm.append("Freinds", " "); createForm.append("Freinds", " ");
createForm.append("Token", Token); createForm.append("Token", Token);
createForm.append("UUID", UUID); createForm.append("UUID", UUID);
@ -1349,7 +1338,6 @@ public class delegationServices {
createForm.append("Password", Password); createForm.append("Password", Password);
createForm.append("FName", FName); createForm.append("FName", FName);
createForm.append("Entitlements", "NA"); createForm.append("Entitlements", "NA");
createForm.append("Path", "C:\\ObsidianCoreStudios\\Launcher\\AOTSK\\");
createForm.append("Token", Token); createForm.append("Token", Token);
createForm.append("Control", 1); createForm.append("Control", 1);
accountS.insertOne(createForm); accountS.insertOne(createForm);
@ -1938,7 +1926,7 @@ public class delegationServices {
Object objid = Lrequest.get("_id"); Object objid = Lrequest.get("_id");
System.out.println(objid); System.out.println(objid);
Document accountServer; Document accountServer;
String Password; String Token;String Fname; String Path; String UserName; String Email; String keychainUUID; Boolean accountKeyStatus = false; String Password; String Token;String Fname; String UserName; String Email; String keychainUUID; Boolean accountKeyStatus = false;
try { try {
accountServer = accountS.find(eq("User", username)).first(); accountServer = accountS.find(eq("User", username)).first();
Password = (String) accountServer.get("Password"); Password = (String) accountServer.get("Password");
@ -2008,7 +1996,6 @@ public class delegationServices {
System.out.println("R3c"); System.out.println("R3c");
Token = (String) accountServer.get("Token"); Token = (String) accountServer.get("Token");
Fname = (String) accountServer.get("FName"); Fname = (String) accountServer.get("FName");
Path = (String) accountServer.get("Path");
Email = (String) accountServer.get("Email"); Email = (String) accountServer.get("Email");
UserName = (String) accountServer.get("User"); UserName = (String) accountServer.get("User");
lastNet = (String) accountServer.get("lastNet"); lastNet = (String) accountServer.get("lastNet");
@ -2035,7 +2022,7 @@ public class delegationServices {
updateQuery2.append("$set", updateQuery2.append("$set",
new BasicDBObject().append("Fname", Fname)); new BasicDBObject().append("Fname", Fname));
updateQuery3.append("$set", updateQuery3.append("$set",
new BasicDBObject().append("Path", Path)); new BasicDBObject().append("Path", "Path has been removed from the service, please update to remove this message."));
updateQuery4.append("$set", updateQuery4.append("$set",
new BasicDBObject().append("User", UserName)); new BasicDBObject().append("User", UserName));
updateQuery7.append("$set", updateQuery7.append("$set",
@ -2124,7 +2111,6 @@ public class delegationServices {
String TKN; String TKN;
String Password; String Password;
String Fname; String Fname;
String Path;
String UserName; String UserName;
String Email; String Email;
String keychainUUID; String keychainUUID;
@ -2139,7 +2125,6 @@ public class delegationServices {
TKN = (String) accountServer.get("Token"); TKN = (String) accountServer.get("Token");
Password = (String) accountServer.get("Password"); Password = (String) accountServer.get("Password");
Fname = (String) accountServer.get("FName"); Fname = (String) accountServer.get("FName");
Path = (String) accountServer.get("Path");
Email = (String) accountServer.get("Email"); Email = (String) accountServer.get("Email");
UserName = (String) accountServer.get("User"); UserName = (String) accountServer.get("User");
validSession = (String) accountServer.get("session"); validSession = (String) accountServer.get("session");
@ -2149,7 +2134,6 @@ public class delegationServices {
BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery2 = new BasicDBObject(); BasicDBObject updateQuery2 = new BasicDBObject();
BasicDBObject updateQuery3 = new BasicDBObject();
BasicDBObject updateQuery4 = new BasicDBObject(); BasicDBObject updateQuery4 = new BasicDBObject();
BasicDBObject updateQuery6 = new BasicDBObject(); BasicDBObject updateQuery6 = new BasicDBObject();
BasicDBObject updateQuery7 = new BasicDBObject(); BasicDBObject updateQuery7 = new BasicDBObject();
@ -2159,8 +2143,6 @@ public class delegationServices {
new BasicDBObject().append("type", 8)); new BasicDBObject().append("type", 8));
updateQuery2.append("$set", updateQuery2.append("$set",
new BasicDBObject().append("Fname", Fname)); new BasicDBObject().append("Fname", Fname));
updateQuery3.append("$set",
new BasicDBObject().append("Path", Path));
updateQuery4.append("$set", updateQuery4.append("$set",
new BasicDBObject().append("User", UserName)); new BasicDBObject().append("User", UserName));
updateQuery7.append("$set", updateQuery7.append("$set",
@ -2175,7 +2157,6 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery8);
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery2); dCollection.updateOne(searchQuery, updateQuery2);
dCollection.updateOne(searchQuery, updateQuery3);
dCollection.updateOne(searchQuery, updateQuery4); dCollection.updateOne(searchQuery, updateQuery4);
dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery8);
dCollection.updateOne(searchQuery, updateQuery7); dCollection.updateOne(searchQuery, updateQuery7);
@ -2259,7 +2240,6 @@ public class delegationServices {
String TKN; String TKN;
String Password; String Password;
String Fname; String Fname;
String Path;
String UserName; String UserName;
String Email; String Email;
String keychainUUID; String keychainUUID;

8
src/main/java/com/jamesquinley/DelegationServices/localNet.java
View File

@ -7,20 +7,20 @@ import com.mongodb.BasicDBObject;
import static com.jamesquinley.DelegationServices.delegationServices.accountS; import static com.jamesquinley.DelegationServices.delegationServices.accountS;
public class localNet { public class localNet {
public static void macRead (String NewMac, String OldMac, String email, String UName, String Token) public static void macRead (String NewIp, String OldIp, String email, String UName, String Token)
{ {
if (OldMac.contains(NewMac)) if (OldIp.contains(NewIp))
{ {
System.out.println("User Logged In From A Known Computer, not sending email"); System.out.println("User Logged In From A Known Computer, not sending email");
} else } else
{ {
System.out.println("Hey this user Logged In From A new Location, dispatching email!"); System.out.println("Hey this user Logged In From A new Location, dispatching email!");
secureCalls.locationBasedEmail(email,UName,NewMac, OldMac); secureCalls.locationBasedEmail(email,UName,NewIp, OldIp);
System.out.println("Switching Trusted Net To New Local"); System.out.println("Switching Trusted Net To New Local");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("Token", Token); searchQuery.append("Token", Token);
BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery = new BasicDBObject();
updateQuery.append("$set", new BasicDBObject().append("lastNet", OldMac +" "+ NewMac)); updateQuery.append("$set", new BasicDBObject().append("lastNet", OldIp +" "+ NewIp));
accountS.updateOne(searchQuery, updateQuery); accountS.updateOne(searchQuery, updateQuery);
} }
} }