Update Grammar, besides that nothing much.

This commit is contained in:
James Quinley 2022-02-17 20:53:07 -08:00
parent be29dea796
commit fca7981fda
3 changed files with 106 additions and 105 deletions

View File

@ -43,9 +43,9 @@ public class emailVerify {
message.setRecipients(Message.RecipientType.TO,
InternetAddress.parse(receiverEmail));
message.setSubject("Welcome To Obsidian Core Studios!");
message.setText("Seems You've Signed Up For An Account, We're Happy To have you here! \n \n \n \n \n " +
message.setText("Seems you've signed up for an account we're happy you're here, and welcome to the Obsidian Core Studios Family! \n \n \n \n \n " +
"This Was Sent On Behalf Of Obsidian Core Studios By Our Super Cool Login Robots." +
"\n You'll Only Get This Email Once (On-boarding Email).");
"\n You'll Only Get This Type Email Once.");
Transport.send(message);
System.out.println("Sent Onboarding Email");

View File

@ -39,8 +39,7 @@ 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 {
@ -52,7 +51,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");
}
@ -65,7 +64,6 @@ public class delegationServices {
}
if (requesttype == 0) {
delegationTimer.DeleteTargetRequest(ClientID);
int CTOKEN = (int) Lrequest.get("Token");
@ -154,7 +152,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);
@ -239,7 +237,7 @@ public class delegationServices {
} else {
System.out.println("Sync Failure");
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("rid",(int) Lrequest.get("rid"));
searchQuery.append("rid", Lrequest.get("rid"));
BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject();
@ -265,7 +263,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);
@ -373,7 +371,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery1);
}
} catch (Exception ERC) {
} catch (Exception ERC) {
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("clientid", ClientID);
@ -437,7 +435,6 @@ public class delegationServices {
updateQuery5.append("$set",
new BasicDBObject().append("Password", Password));
updateQuery7.append("$set",
new BasicDBObject().append("Email", Email));
@ -487,7 +484,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);
@ -550,7 +547,6 @@ public class delegationServices {
updateQuery5.append("$set",
new BasicDBObject().append("Password", Password));
updateQuery7.append("$set",
new BasicDBObject().append("Email", Email));
@ -600,7 +596,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);
@ -617,89 +613,91 @@ 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();
String User = (String) DServer.get("User");
String Password = (String) DServer.get("Password");
String Email = (String) DServer.get("Email");
String FName = (String) DServer.get("FName");
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");
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("clientid", ClientID);
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);
BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject();
updateQuery.append("$set",
new BasicDBObject().append("type", 6));
updateQuery1.append("$set",
new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1);
} catch (Exception exr) {
System.out.println("Username Is Open");
try {
Document DupeToken = accountS.find(eq("Token", tokenSTGEN)).first();
int DupeToke1n = (int) DupeToken.get("Token");
BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject();
updateQuery.append("$set",
new BasicDBObject().append("type", 6));
updateQuery1.append("$set",
new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1);
} catch (Exception exr) {
System.out.println("Username Is Open");
try {
Document DupeToken = accountS.find(eq("Token", tokenSTGEN)).first();
int DupeToke1n = (int) DupeToken.get("Token");
Boolean TokenOpen = false;
while (TokenOpen == false) {
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;
tokenSTGEN = (int) tokenGEN;
} catch (Exception exDr) {
TokenOpen = true;
System.out.println("Token Free (While EXP)");
}
}
} catch (Exception exrs) {
System.out.println("Token Free (Main)");
System.out.println("Creating.");
Document createForm = new Document();
createForm.append("User", User);
createForm.append("Password", Password);
createForm.append("Status", true);
createForm.append("Flagged", false);
createForm.append("Email", Email);
createForm.append("FName", FName);
createForm.append("Entitlements", "NA");
createForm.append("Path", "C:\\ObsidianCoreStudios\\Launcher\\AOTSK\\");
createForm.append("Freinds", " ");
createForm.append("Token", tokenSTGEN);
createForm.append("Control", 1);
accountS.insertOne(createForm);
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("clientid", ClientID);
com.jamesquinley.Asecure.emailVerify.Onboarding(Email);
BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject();
updateQuery.append("$set",
new BasicDBObject().append("type", 4));
updateQuery1.append("$set",
new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1);
System.out.println("Update Request With Finished Status");
Boolean TokenOpen = false;
while (TokenOpen == false) {
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;
tokenSTGEN = (int) tokenGEN;
} catch (Exception exDr) {
TokenOpen = true;
System.out.println("Token Free (While EXP)");
}
}
} catch (Exception exrs) {
System.out.println("Token Free (Main)");
System.out.println("Creating.");
Document createForm = new Document();
createForm.append("User", User);
createForm.append("Password", Password);
createForm.append("Status", true);
createForm.append("Flagged", false);
createForm.append("Email", Email);
createForm.append("FName", FName);
createForm.append("Entitlements", "NA");
createForm.append("Path", "C:\\ObsidianCoreStudios\\Launcher\\AOTSK\\");
createForm.append("Freinds", " ");
createForm.append("Token", tokenSTGEN);
createForm.append("Control", 1);
accountS.insertOne(createForm);
BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("clientid", ClientID);
com.jamesquinley.Asecure.emailVerify.Onboarding(Email);
BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject();
updateQuery.append("$set",
new BasicDBObject().append("type", 4));
updateQuery1.append("$set",
new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1);
System.out.println("Update Request With Finished Status");
}
}
}
}
}
} else {
@ -713,7 +711,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);
@ -727,7 +725,8 @@ 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);
@ -737,32 +736,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) {
System.out.println("No Pending Authentication");
delegationTimer.trigger();
}
}
public static void delegate() {
userAuthetication();
}
public static void userAuthetication() {
try {
delegationProcesser();
} catch (Exception exr) {
System.out.println("No Pending Authentication");
delegationTimer.trigger();
}
}
}

View File

@ -27,11 +27,11 @@ public class delegationTimer {
{
final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
final Runnable runnable = new Runnable() {
int countdownStarter = 9;
int countdownStarter = 5;
public void run() {
countdownStarter--;
if (countdownStarter <= 0) {
countdownStarter = 9;
countdownStarter = 5;
delegationServices.TargetDelete(CID);
scheduler.shutdown();
}