Set to beta server, this starts the transition to the "modern" framework.

This commit is contained in:
James Quinley 2022-11-10 07:01:35 -08:00
parent ecaae3d288
commit 09808204b5
4 changed files with 70 additions and 37 deletions

25
.idea/artifacts/AOTSKBetaServer.xml generated Normal file
View File

@ -0,0 +1,25 @@
<component name="ArtifactManager">
<artifact type="jar" name="AOTSKBetaServer">
<output-path>$PROJECT_DIR$/out/artifacts/AOTSKBetaServer</output-path>
<root id="archive" name="AOTSKBetaServer.jar">
<element id="module-output" name="AOTSK-Login-Delegation-Server" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-core/2.17.0/log4j-core-2.17.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/sun/mail/javax.mail/1.6.2/javax.mail-1.6.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/mail/javax.mail-api/1.6.2/javax.mail-api-1.6.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/jfoenix/jfoenix/8.0.10/jfoenix-8.0.10.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/controlsfx/controlsfx/11.1.1/controlsfx-11.1.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.14.2/jsoup-1.14.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/4.3.2/mongodb-driver-core-4.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-sync/4.3.2/mongodb-driver-sync-4.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/bson/4.3.2/bson-4.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/theokanning/openai-gpt3-java/api/0.4.0/api-0.4.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/net/lingala/zip4j/zip4j/2.6.1/zip4j-2.6.1.jar" path-in-jar="/" />
</root>
</artifact>
</component>

View File

@ -260,22 +260,22 @@ public class delegationServices {
} }
if (requesttype == 0) { if (requesttype == 0) {
int CTOKEN = (int) Lrequest.get("Token"); String CTOKEN = (String) Lrequest.get("Token");
System.out.println("Sync Request (Read)"); System.out.println("Sync Request (Read)");
Document accountServer; Document accountServer;
String Password; String Password;
int Token; String Token;
String Fname; String Fname;
String Path; String Path;
String UserName; String UserName;
String Email; String Email;
try { try {
accountServer = accountS.find(eq("Token", CTOKEN)).first(); accountServer = accountS.find(eq("Token", CTOKEN)).first();
Token = (int) accountServer.get("Token"); Token = (String) accountServer.get("Token");
if (accountServer.get("Status").equals(true)) { if (accountServer.get("Status").equals(true)) {
if (Token == CTOKEN) { if (Token.equals(CTOKEN)) {
Token = (int) accountServer.get("Token"); Token = (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"); Path = (String) accountServer.get("Path");
@ -368,18 +368,18 @@ public class delegationServices {
//sync write request //sync write request
if (requesttype == 1) { if (requesttype == 1) {
System.out.println("Sync Request (Write)"); System.out.println("Sync Request (Write)");
int CTOKEN = (int) Lrequest.get("Token"); String CTOKEN = (String) Lrequest.get("Token");
Document accountServer; Document accountServer;
int Token; String Token;
String Fname; String Fname;
String Path; String Path;
String UserName; String UserName;
try { try {
accountServer = accountS.find(eq("Token", CTOKEN)).first(); accountServer = accountS.find(eq("Token", CTOKEN)).first();
Token = (int) accountServer.get("Token"); Token = (String) accountServer.get("Token");
if (accountServer.get("Status").equals(true)) { if (accountServer.get("Status").equals(true)) {
if (Token == CTOKEN) { if (Token.equals(CTOKEN)) {
Token = (int) Lrequest.get("Token"); Token = (String) Lrequest.get("Token");
Path = (String) Lrequest.get("Path"); Path = (String) Lrequest.get("Path");
System.out.println("Got info."); System.out.println("Got info.");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
@ -454,7 +454,7 @@ public class delegationServices {
String password = (String) Lrequest.get("Password"); String password = (String) Lrequest.get("Password");
Document accountServer; Document accountServer;
String Password; String Password;
int Token; String Token;
String Fname; String Fname;
String Path; String Path;
String UserName; String UserName;
@ -528,7 +528,7 @@ public class delegationServices {
System.out.println("RSC"); System.out.println("RSC");
if (Password.equals(password)) { if (Password.equals(password)) {
System.out.println("R3c"); System.out.println("R3c");
Token = (int) accountServer.get("Token"); Token = (String) accountServer.get("Token");
Fname = (String) accountServer.get("FName"); Fname = (String) accountServer.get("FName");
Path = (String) accountServer.get("Path"); Path = (String) accountServer.get("Path");
Email = (String) accountServer.get("Email"); Email = (String) accountServer.get("Email");
@ -777,10 +777,10 @@ public class delegationServices {
} }
if (requesttype == 3) { if (requesttype == 3) {
System.out.println("Login Request (TKN)"); System.out.println("Login Request (TKN)");
int CTOKEN = (int) Lrequest.get("Token"); String CTOKEN = (String) Lrequest.get("Token");
// Document TResolve = dCollection.find(eq("type", 3)).first(); // Document TResolve = dCollection.find(eq("type", 3)).first();
Document accountServer; Document accountServer;
int TKN; String TKN;
String Password; String Password;
String Fname; String Fname;
String Path; String Path;
@ -789,10 +789,10 @@ public class delegationServices {
String keychainUUID; String keychainUUID;
try { try {
accountServer = accountS.find(eq("Token", CTOKEN)).first(); accountServer = accountS.find(eq("Token", CTOKEN)).first();
TKN = (int) accountServer.get("Token"); TKN = (String) accountServer.get("Token");
if (accountServer.get("Status").equals(true)) { if (accountServer.get("Status").equals(true)) {
if (TKN == CTOKEN) { if (TKN.equals(CTOKEN)) {
TKN = (int) 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"); Path = (String) accountServer.get("Path");
@ -1053,14 +1053,19 @@ public class delegationServices {
String Password = (String) DServer.get("Password"); String Password = (String) DServer.get("Password");
String Email = (String) DServer.get("Email"); String Email = (String) DServer.get("Email");
String FName = (String) DServer.get("FName"); String FName = (String) DServer.get("FName");
int min = 100000000; String sourcet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456789";
int max = 999999999; StringBuilder sbt = new StringBuilder();
double tokenGEN = Math.random() * (max - min + 1) + min; Random random = new Random();
int tokenSTGEN = (int) tokenGEN; int tokenlength = 60;
for (int i = 0; i < tokenlength; i++) {
int index = random.nextInt(sourcet.length());
char randomChar = sourcet.charAt(index);
sbt.append(randomChar);
}
String Token = sbt.toString();
//Above makes token, it will be remade if it already exists //Above makes token, it will be remade if it already exists
String source = "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456789"; String source = "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456789";
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
Random random = new Random();
int length = 40; int length = 40;
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
int index = random.nextInt(source.length()); int index = random.nextInt(source.length());
@ -1088,19 +1093,26 @@ public class delegationServices {
} catch (Exception exr) { } catch (Exception exr) {
System.out.println("Username Is Open"); System.out.println("Username Is Open");
try { try {
Document DupeToken = accountS.find(eq("Token", tokenSTGEN)).first(); Document DupeToken = accountS.find(eq("Token", Token)).first();
int DupeToke1n = (int) DupeToken.get("Token"); String DupeToke1n = (String) DupeToken.get("Token");
System.out.println("Got Token from request"); System.out.println("Got Token from request");
Boolean TokenOpen = false; Boolean TokenOpen = false;
while (TokenOpen == false) { while (TokenOpen == false) {
tokenGEN = Math.random() * (max - min + 1) + min; for (int i = 0; i < tokenlength; i++) {
tokenSTGEN = (int) tokenGEN; int index = random.nextInt(sourcet.length());
char randomChar = sourcet.charAt(index);
sbt.append(randomChar);
}
Token = sbt.toString();
try { try {
DupeToken = accountS.find(eq("Token", tokenSTGEN)).first(); DupeToken = accountS.find(eq("Token", Token)).first();
DupeToke1n = (int) DupeToken.get("Token"); DupeToke1n = (String) DupeToken.get("Token");
System.out.println("Token Is Reserved, Try Again."); System.out.println("Token Is Reserved, Try Again.");
tokenGEN = Math.random() * (max - min + 1) + min; for (int i = 0; i < tokenlength; i++) {
tokenSTGEN = (int) tokenGEN; int index = random.nextInt(sourcet.length());
char randomChar = sourcet.charAt(index);
sbt.append(randomChar);
}
} catch (Exception exDr) { } catch (Exception exDr) {
TokenOpen = true; TokenOpen = true;
System.out.println("Token Free (While EXP)"); System.out.println("Token Free (While EXP)");
@ -1157,7 +1169,7 @@ public class delegationServices {
createForm.append("Entitlements", "NA"); createForm.append("Entitlements", "NA");
createForm.append("Path", "C:\\ObsidianCoreStudios\\Application\\"); createForm.append("Path", "C:\\ObsidianCoreStudios\\Application\\");
createForm.append("Freinds", " "); createForm.append("Freinds", " ");
createForm.append("Token", tokenSTGEN); createForm.append("Token", Token);
createForm.append("UUID", UUID); createForm.append("UUID", UUID);
createForm.append("Control", 1); createForm.append("Control", 1);
createForm.append("Upgrade", 0); createForm.append("Upgrade", 0);
@ -1652,10 +1664,6 @@ public class delegationServices {
delegationTimer.DeleteTargetRequest(ClientID); delegationTimer.DeleteTargetRequest(ClientID);
} }
} }
//above is finding one request and starting wheels
//delegationTimer.trigger();
delegate(); delegate();
} }

View File

@ -6,7 +6,7 @@ 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, int Token) public static void macRead (String NewMac, String OldMac, String email, String UName, String Token)
{ {
if (OldMac.contains(NewMac)) if (OldMac.contains(NewMac))
{ {

View File

@ -1,6 +1,6 @@
package com.jamesquinley.DelegationServices; package com.jamesquinley.DelegationServices;
public class status { public class status {
public static boolean betaServer = false; public static boolean betaServer = true;
public static String serverVersion = "1.1"; public static String serverVersion = "1.1";
} }