More stuff, account creation/deletion is disabled for legacy services.
This commit is contained in:
James Quinley
parent
fa19618264
commit
b8fe2cd5c3
@ -82,7 +82,9 @@ public class delegationServices {
|
||||
static int RequestR;
|
||||
//still need to config
|
||||
public static String lastNet = null;
|
||||
public static String Macid = null;
|
||||
public static String IPA = null;
|
||||
private static Boolean legacy = false;
|
||||
private static double version = 0.0;
|
||||
|
||||
public static void banUserID(String UUID) {
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
@ -103,10 +105,23 @@ public class delegationServices {
|
||||
System.out.println("This request has opted out of CID.");
|
||||
}
|
||||
try {
|
||||
Macid = (String) Lrequest.get("net");
|
||||
IPA = (String) Lrequest.get("net");
|
||||
} catch (Exception exrp) {
|
||||
System.out.println("This request has opted out of NET.");
|
||||
}
|
||||
try {
|
||||
version = (double) Lrequest.get("apiversion");
|
||||
if (version >= 2.0) {
|
||||
legacy =false;
|
||||
System.out.println("nonlegacy");
|
||||
} else {
|
||||
legacy =true;
|
||||
System.out.println("legacy");
|
||||
}
|
||||
} catch (Exception exrp) {
|
||||
legacy = true;
|
||||
System.out.println("legacy");
|
||||
}
|
||||
|
||||
String RG = (String) Lrequest.get("rg");
|
||||
Filter = RGFilter.find(eq("rgkey", "UAROCKS")).first();
|
||||
@ -563,6 +578,17 @@ public class delegationServices {
|
||||
new BasicDBObject().append("status", true));
|
||||
updateQuery8.append("$set",
|
||||
new BasicDBObject().append("keychainUUID", keychainUUID));
|
||||
if (legacy) {
|
||||
if ((Boolean) Filter.get("legacyPRDisable") == true) {
|
||||
BasicDBObject updateQuery11 = new BasicDBObject();
|
||||
updateQuery11.append("$set",
|
||||
new BasicDBObject().append("home", Filter.get("legacyHome")));
|
||||
updateQuery12.append("$set",
|
||||
new BasicDBObject().append("hs",true));
|
||||
dCollection.updateOne(searchQuery, updateQuery11);
|
||||
dCollection.updateOne(searchQuery, updateQuery12);
|
||||
}
|
||||
} else {
|
||||
if (Filter.get("customHome").equals(true)) {
|
||||
BasicDBObject updateQuery11 = new BasicDBObject();
|
||||
updateQuery11.append("$set",
|
||||
@ -576,6 +602,7 @@ public class delegationServices {
|
||||
new BasicDBObject().append("hs",false));
|
||||
dCollection.updateOne(searchQuery, updateQuery12);
|
||||
}
|
||||
}
|
||||
/*
|
||||
if (Filter.get("customGreeting").equals(true)) {
|
||||
BasicDBObject updateQuery12 = new BasicDBObject();
|
||||
@ -603,7 +630,7 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery8);
|
||||
//delegationTimer.trigger();
|
||||
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
|
||||
localNet.macRead(Macid, lastNet, Email, UserName, Token);
|
||||
localNet.macRead(IPA, lastNet, Email, UserName, Token);
|
||||
} else {
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("_id", ClientID);
|
||||
@ -834,6 +861,7 @@ public class delegationServices {
|
||||
BasicDBObject updateQuery8 = new BasicDBObject();
|
||||
BasicDBObject updateQuery9 = new BasicDBObject();
|
||||
BasicDBObject updateQuery10 = new BasicDBObject();
|
||||
BasicDBObject updateQuery12 = new BasicDBObject();
|
||||
updateQuery.append("$set",
|
||||
new BasicDBObject().append("type", 8));
|
||||
updateQuery2.append("$set",
|
||||
@ -850,18 +878,30 @@ public class delegationServices {
|
||||
new BasicDBObject().append("keychainUUID", keychainUUID));
|
||||
updateQuery6.append("$set",
|
||||
new BasicDBObject().append("status", true));
|
||||
if (legacy) {
|
||||
if ((Boolean) Filter.get("legacyPRDisable") == true) {
|
||||
BasicDBObject updateQuery11 = new BasicDBObject();
|
||||
updateQuery11.append("$set",
|
||||
new BasicDBObject().append("home", Filter.get("legacyHome")));
|
||||
updateQuery12.append("$set",
|
||||
new BasicDBObject().append("hs",true));
|
||||
dCollection.updateOne(searchQuery, updateQuery11);
|
||||
dCollection.updateOne(searchQuery, updateQuery12);
|
||||
}
|
||||
} else {
|
||||
if (Filter.get("customHome").equals(true)) {
|
||||
BasicDBObject updateQuery11 = new BasicDBObject();
|
||||
updateQuery11.append("$set",
|
||||
new BasicDBObject().append("home", Filter.get("valHome")));
|
||||
updateQuery10.append("$set",
|
||||
updateQuery12.append("$set",
|
||||
new BasicDBObject().append("hs",true));
|
||||
dCollection.updateOne(searchQuery, updateQuery11);
|
||||
dCollection.updateOne(searchQuery, updateQuery10);
|
||||
dCollection.updateOne(searchQuery, updateQuery12);
|
||||
} else {
|
||||
updateQuery10.append("$set",
|
||||
updateQuery12.append("$set",
|
||||
new BasicDBObject().append("hs",false));
|
||||
dCollection.updateOne(searchQuery, updateQuery10);
|
||||
dCollection.updateOne(searchQuery, updateQuery12);
|
||||
}
|
||||
}
|
||||
System.out.println("Sending Info To Forwarding Server");
|
||||
dCollection.updateOne(searchQuery, updateQuery8);
|
||||
@ -875,7 +915,7 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery6);
|
||||
//delegationTimer.trigger();
|
||||
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
|
||||
localNet.macRead(Macid, lastNet, Email, UserName, TKN);
|
||||
localNet.macRead(IPA, lastNet, Email, UserName, TKN);
|
||||
} else {
|
||||
System.out.println("Login Failure");
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
@ -1092,6 +1132,20 @@ public class delegationServices {
|
||||
|
||||
}
|
||||
if (requesttype == 10) {
|
||||
if (legacy && (Boolean) Filter.get("legacyPRDisable") == true) {
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("_id", ClientID);
|
||||
BasicDBObject updateQuery = new BasicDBObject();
|
||||
BasicDBObject updateQuery1 = new BasicDBObject();
|
||||
updateQuery.append("$set",
|
||||
new BasicDBObject().append("type", 52));
|
||||
updateQuery1.append("$set",
|
||||
new BasicDBObject().append("status", true));
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
System.out.println("Update Request With Aborted Status");
|
||||
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
|
||||
} else {
|
||||
System.out.println("Account Creation Request");
|
||||
Document DServer = dCollection.find(eq("_id", ClientID)).first();
|
||||
String User = (String) DServer.get("User");
|
||||
@ -1226,7 +1280,7 @@ public class delegationServices {
|
||||
createForm.append("Version", "2");
|
||||
createForm.append("keyStatus", false);
|
||||
//createForm.append("Uid",uid);
|
||||
createForm.append("lastNet", Macid);
|
||||
createForm.append("lastNet", IPA);
|
||||
accountS.insertOne(createForm);
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("_id", ClientID);
|
||||
@ -1261,6 +1315,7 @@ public class delegationServices {
|
||||
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (requesttype == 20)
|
||||
//TODO rewrite to just need username, password will be set by system later
|
||||
{
|
||||
@ -1403,7 +1458,29 @@ public class delegationServices {
|
||||
new BasicDBObject().append("dn", dr));
|
||||
System.out.println("Denied");
|
||||
}
|
||||
|
||||
if (legacy) {
|
||||
if ((Boolean) Filter.get("legacyPRDisable") == true) {
|
||||
updateQuery2.append("$set",
|
||||
new BasicDBObject().append("uNotes", (String) Filter.get("legacyPRUpdateDisplay")));
|
||||
updateQuery3.append("$set",
|
||||
new BasicDBObject().append("pushV", version));
|
||||
updateQuery4.append("$set",
|
||||
new BasicDBObject().append("keyReq", pKey));
|
||||
updateQuery8.append("$set",
|
||||
new BasicDBObject().append("news", (String) Filter.get("legacyNews")));
|
||||
updateQuery6.append("$set",
|
||||
new BasicDBObject().append("status", true));
|
||||
updateQuery7.append("$set",
|
||||
new BasicDBObject().append("dn", dr));
|
||||
System.out.println("Sending Info To Forwarding Server");
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery2);
|
||||
dCollection.updateOne(searchQuery, updateQuery3);
|
||||
dCollection.updateOne(searchQuery, updateQuery4);
|
||||
dCollection.updateOne(searchQuery, updateQuery7);
|
||||
dCollection.updateOne(searchQuery, updateQuery8);
|
||||
dCollection.updateOne(searchQuery, updateQuery6);
|
||||
} else {
|
||||
updateQuery2.append("$set",
|
||||
new BasicDBObject().append("uNotes", platformUpdateNotes));
|
||||
updateQuery3.append("$set",
|
||||
@ -1424,6 +1501,29 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery7);
|
||||
dCollection.updateOne(searchQuery, updateQuery8);
|
||||
dCollection.updateOne(searchQuery, updateQuery6);
|
||||
}
|
||||
} else {
|
||||
updateQuery2.append("$set",
|
||||
new BasicDBObject().append("uNotes", platformUpdateNotes));
|
||||
updateQuery3.append("$set",
|
||||
new BasicDBObject().append("pushV", version));
|
||||
updateQuery4.append("$set",
|
||||
new BasicDBObject().append("keyReq", pKey));
|
||||
updateQuery8.append("$set",
|
||||
new BasicDBObject().append("news", nw));
|
||||
updateQuery6.append("$set",
|
||||
new BasicDBObject().append("status", true));
|
||||
updateQuery7.append("$set",
|
||||
new BasicDBObject().append("dn", dr));
|
||||
System.out.println("Sending Info To Forwarding Server");
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery2);
|
||||
dCollection.updateOne(searchQuery, updateQuery3);
|
||||
dCollection.updateOne(searchQuery, updateQuery4);
|
||||
dCollection.updateOne(searchQuery, updateQuery7);
|
||||
dCollection.updateOne(searchQuery, updateQuery8);
|
||||
dCollection.updateOne(searchQuery, updateQuery6);
|
||||
}
|
||||
//delegationTimer.trigger();
|
||||
System.out.println("Pushed");
|
||||
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
|
||||
@ -1746,6 +1846,21 @@ public class delegationServices {
|
||||
|
||||
}
|
||||
if (requesttype == 67) {
|
||||
if (legacy && (Boolean) Filter.get("legacyPRDisable") == true) {
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("_id", ClientID);
|
||||
BasicDBObject updateQuery = new BasicDBObject();
|
||||
BasicDBObject updateQuery1 = new BasicDBObject();
|
||||
updateQuery.append("$set",
|
||||
new BasicDBObject().append("type", 52));
|
||||
updateQuery1.append("$set",
|
||||
new BasicDBObject().append("status", true));
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
System.out.println("Update Request With Aborted Status");
|
||||
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
|
||||
} else
|
||||
{
|
||||
String OTK = "keyNotSetDueToError(ERR24)";
|
||||
Boolean keyStatus = false;
|
||||
//default false, since will be set to true if the measurement exists on linked account
|
||||
@ -1789,6 +1904,7 @@ public class delegationServices {
|
||||
dCollection.updateOne(clearCL, clearUO);
|
||||
TargetDelete(ClientID);
|
||||
}
|
||||
}
|
||||
if (requesttype == 81) {
|
||||
System.out.println("Login Request (TKN)");
|
||||
String CTOKEN = (String) Lrequest.get("token");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user