Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
This commit is contained in:
commit
1979d7ee69
@ -39,7 +39,8 @@ public class delegationServices {
|
||||
//still need to config
|
||||
public static void delegationProcesser() {
|
||||
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");
|
||||
Lrequest = null;
|
||||
} else {
|
||||
@ -51,7 +52,7 @@ public class delegationServices {
|
||||
//TODO Get this working, it broke and it wont get OBJ id
|
||||
|
||||
System.out.println("Delegation Has Started");
|
||||
if (requesttype == 0 || requesttype == 1 || requesttype == 2 || requesttype == 3 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype == 7 || requesttype == 8 || requesttype == 9 || requesttype == 10 || requesttype == 11 || requesttype == 12) {
|
||||
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) {
|
||||
if (requesttype == 7 || requesttype == 12 || requesttype == 4 || requesttype == 5 || requesttype == 6) {
|
||||
System.out.println("An Excluded Request (7MAL, 12S, 4C, 5C, 6C) Has Been Detected, Ignoring");
|
||||
}
|
||||
@ -64,6 +65,7 @@ public class delegationServices {
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (requesttype == 0) {
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
int CTOKEN = (int) Lrequest.get("Token");
|
||||
@ -152,7 +154,7 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
|
||||
}
|
||||
} catch (MongoCommandException ERC) {
|
||||
} catch(MongoCommandException ERC){
|
||||
System.out.println("Malformed Request");
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("clientid", ClientID);
|
||||
@ -237,7 +239,7 @@ public class delegationServices {
|
||||
} else {
|
||||
System.out.println("Sync Failure");
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("rid", Lrequest.get("rid"));
|
||||
searchQuery.append("rid",(int) Lrequest.get("rid"));
|
||||
|
||||
BasicDBObject updateQuery = new BasicDBObject();
|
||||
BasicDBObject updateQuery1 = new BasicDBObject();
|
||||
@ -263,7 +265,7 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
}
|
||||
} catch (MongoCommandException ERC) {
|
||||
} catch(MongoCommandException ERC){
|
||||
System.out.println("Malformed Request");
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("clientid", ClientID);
|
||||
@ -433,8 +435,6 @@ public class delegationServices {
|
||||
updateQuery4.append("$set",
|
||||
new BasicDBObject().append("User", UserName));
|
||||
updateQuery5.append("$set",
|
||||
|
||||
|
||||
new BasicDBObject().append("Password", Password));
|
||||
updateQuery7.append("$set",
|
||||
new BasicDBObject().append("Email", Email));
|
||||
@ -547,6 +547,7 @@ public class delegationServices {
|
||||
updateQuery5.append("$set",
|
||||
|
||||
|
||||
|
||||
new BasicDBObject().append("Password", Password));
|
||||
updateQuery7.append("$set",
|
||||
new BasicDBObject().append("Email", Email));
|
||||
@ -613,26 +614,24 @@ public class delegationServices {
|
||||
//delegationTimer.trigger();
|
||||
}
|
||||
}
|
||||
if (requesttype == 10) {
|
||||
if (requesttype == 10)
|
||||
{
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
System.out.println("Account Creation Request");
|
||||
Document DServer = dCollection.find(eq("clientid", ClientID)).first();
|
||||
Document DServer = dCollection.find(eq("clientid",ClientID)).first();
|
||||
String User = (String) DServer.get("User");
|
||||
String Password = (String) DServer.get("Password");
|
||||
String Email = (String) DServer.get("Email");
|
||||
String FName = (String) DServer.get("FName");
|
||||
int min = 100000000;
|
||||
int max = 999999999;
|
||||
double tokenGEN = Math.random() * (max - min + 1) + min;
|
||||
double tokenGEN = Math.random()*(max-min+1)+min;
|
||||
int tokenSTGEN = (int) tokenGEN;
|
||||
|
||||
//verify open cert
|
||||
try {
|
||||
Document DupeUser = accountS.find(eq("User", User)).first();
|
||||
String DUPE = (String) DupeUser.get("User");
|
||||
if (DUPE.equalsIgnoreCase(User)) {
|
||||
System.out.println("This Username Is Not Open");
|
||||
}
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("clientid", ClientID);
|
||||
|
||||
@ -652,13 +651,13 @@ public class delegationServices {
|
||||
|
||||
Boolean TokenOpen = false;
|
||||
while (TokenOpen == false) {
|
||||
tokenGEN = Math.random() * (max - min + 1) + min;
|
||||
tokenGEN = Math.random()*(max-min+1)+min;
|
||||
tokenSTGEN = (int) tokenGEN;
|
||||
try {
|
||||
DupeToken = accountS.find(eq("Token", tokenSTGEN)).first();
|
||||
DupeToke1n = (int) DupeToken.get("Token");
|
||||
System.out.println("Token Is Reserved, Try Again.");
|
||||
tokenGEN = Math.random() * (max - min + 1) + min;
|
||||
tokenGEN = Math.random()*(max-min+1)+min;
|
||||
tokenSTGEN = (int) tokenGEN;
|
||||
} catch (Exception exDr) {
|
||||
TokenOpen = true;
|
||||
@ -711,7 +710,7 @@ public class delegationServices {
|
||||
new BasicDBObject().append("type", 7));
|
||||
updateQuery1.append("$set",
|
||||
new BasicDBObject().append("status", true));
|
||||
Lrequest.append("status", true);
|
||||
Lrequest.append("status",true);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
|
||||
@ -725,8 +724,7 @@ public class delegationServices {
|
||||
//delegationTimer.trigger();
|
||||
delegate();
|
||||
}
|
||||
|
||||
public static void Purge() {
|
||||
public static void Purge () {
|
||||
BasicDBObject searchQueryT = new BasicDBObject();
|
||||
BasicDBObject searchQueryF = new BasicDBObject();
|
||||
searchQueryT.append("status", true);
|
||||
@ -736,29 +734,27 @@ 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() {
|
||||
} public static void delegate ()
|
||||
{
|
||||
userAuthetication();
|
||||
}
|
||||
|
||||
public static void userAuthetication() {
|
||||
public static void userAuthetication (){
|
||||
try {
|
||||
delegationProcesser();
|
||||
} catch (Exception exr) {
|
||||
@ -766,4 +762,4 @@ public class delegationServices {
|
||||
delegationTimer.trigger();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user