Added OTK email and basic gen, need to work on callback and OTK storage within the account database.
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
package com.jamesquinley.DelegationServices;
|
||||
|
||||
import com.jamesquinley.Asecure.electronicMailHandler;
|
||||
import com.mongodb.BasicDBObject;
|
||||
import com.mongodb.ConnectionString;
|
||||
import com.mongodb.MongoClientSettings;
|
||||
@ -10,7 +11,7 @@ import com.mongodb.client.MongoCollection;
|
||||
import com.mongodb.client.MongoDatabase;
|
||||
import org.bson.Document;
|
||||
|
||||
import javax.print.Doc;
|
||||
import java.util.Random;
|
||||
import java.util.UUID;
|
||||
|
||||
import static com.mongodb.client.model.Filters.eq;
|
||||
@ -456,65 +457,85 @@ public class delegationServices {
|
||||
try {
|
||||
accountServer = accountS.find(eq("User", username)).first();
|
||||
Password = (String) accountServer.get("Password");
|
||||
System.out.println("Stuff");
|
||||
if (accountServer.get("Status").equals(true)) {
|
||||
if (Password.equals(password)) {
|
||||
Token = (int) accountServer.get("Token");
|
||||
Fname = (String) accountServer.get("FName");
|
||||
Path = (String) accountServer.get("Path");
|
||||
Email = (String) accountServer.get("Email");
|
||||
UserName = (String) accountServer.get("User");
|
||||
lastNet = (String) accountServer.get("lastNet");
|
||||
localNet.macRead(Macid, lastNet, Email, UserName, Token);
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("clientid", ClientID);
|
||||
BasicDBObject updateQuery = new BasicDBObject();
|
||||
BasicDBObject updateQuery1 = new BasicDBObject();
|
||||
BasicDBObject updateQuery2 = new BasicDBObject();
|
||||
BasicDBObject updateQuery3 = new BasicDBObject();
|
||||
BasicDBObject updateQuery4 = new BasicDBObject();
|
||||
BasicDBObject updateQuery5 = new BasicDBObject();
|
||||
BasicDBObject updateQuery6 = new BasicDBObject();
|
||||
BasicDBObject updateQuery7 = new BasicDBObject();
|
||||
updateQuery.append("$set",
|
||||
new BasicDBObject().append("type", 8));
|
||||
updateQuery1.append("$set",
|
||||
new BasicDBObject().append("Token", Token));
|
||||
updateQuery2.append("$set",
|
||||
new BasicDBObject().append("Fname", Fname));
|
||||
updateQuery3.append("$set",
|
||||
new BasicDBObject().append("Path", Path));
|
||||
updateQuery4.append("$set",
|
||||
new BasicDBObject().append("User", UserName));
|
||||
updateQuery5.append("$set",
|
||||
new BasicDBObject().append("Password", Password));
|
||||
updateQuery7.append("$set",
|
||||
new BasicDBObject().append("Email", Email));
|
||||
updateQuery6.append("$set",
|
||||
new BasicDBObject().append("status", true));
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
dCollection.updateOne(searchQuery, updateQuery2);
|
||||
dCollection.updateOne(searchQuery, updateQuery3);
|
||||
dCollection.updateOne(searchQuery, updateQuery4);
|
||||
dCollection.updateOne(searchQuery, updateQuery5);
|
||||
dCollection.updateOne(searchQuery, updateQuery6);
|
||||
dCollection.updateOne(searchQuery, updateQuery7);
|
||||
//delegationTimer.trigger();
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
} else {
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("clientid", ClientID);
|
||||
System.out.println("Stuff1");
|
||||
if (accountServer.get("Version").equals("1"))
|
||||
{
|
||||
System.out.println("Generating OTP");
|
||||
String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456789";
|
||||
StringBuilder sb = new StringBuilder();
|
||||
Random random = new Random();
|
||||
int length = 15;
|
||||
for(int i = 0; i < length; i++) {
|
||||
int index = random.nextInt(alphabet.length());
|
||||
char randomChar = alphabet.charAt(index);
|
||||
sb.append(randomChar);
|
||||
}
|
||||
String randomString = sb.toString();
|
||||
|
||||
BasicDBObject updateQuery = new BasicDBObject();
|
||||
BasicDBObject updateQuery1 = new BasicDBObject();
|
||||
updateQuery.append("$set",
|
||||
new BasicDBObject().append("type", 7));
|
||||
updateQuery1.append("$set",
|
||||
new BasicDBObject().append("status", true));
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
//delegationTimer.trigger();
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Password.equals(password)) {
|
||||
Token = (int) accountServer.get("Token");
|
||||
Fname = (String) accountServer.get("FName");
|
||||
Path = (String) accountServer.get("Path");
|
||||
Email = (String) accountServer.get("Email");
|
||||
UserName = (String) accountServer.get("User");
|
||||
lastNet = (String) accountServer.get("lastNet");
|
||||
localNet.macRead(Macid, lastNet, Email, UserName, Token);
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("clientid", ClientID);
|
||||
BasicDBObject updateQuery = new BasicDBObject();
|
||||
BasicDBObject updateQuery1 = new BasicDBObject();
|
||||
BasicDBObject updateQuery2 = new BasicDBObject();
|
||||
BasicDBObject updateQuery3 = new BasicDBObject();
|
||||
BasicDBObject updateQuery4 = new BasicDBObject();
|
||||
BasicDBObject updateQuery5 = new BasicDBObject();
|
||||
BasicDBObject updateQuery6 = new BasicDBObject();
|
||||
BasicDBObject updateQuery7 = new BasicDBObject();
|
||||
updateQuery.append("$set",
|
||||
new BasicDBObject().append("type", 8));
|
||||
updateQuery1.append("$set",
|
||||
new BasicDBObject().append("Token", Token));
|
||||
updateQuery2.append("$set",
|
||||
new BasicDBObject().append("Fname", Fname));
|
||||
updateQuery3.append("$set",
|
||||
new BasicDBObject().append("Path", Path));
|
||||
updateQuery4.append("$set",
|
||||
new BasicDBObject().append("User", UserName));
|
||||
updateQuery5.append("$set",
|
||||
new BasicDBObject().append("Password", Password));
|
||||
updateQuery7.append("$set",
|
||||
new BasicDBObject().append("Email", Email));
|
||||
updateQuery6.append("$set",
|
||||
new BasicDBObject().append("status", true));
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
dCollection.updateOne(searchQuery, updateQuery2);
|
||||
dCollection.updateOne(searchQuery, updateQuery3);
|
||||
dCollection.updateOne(searchQuery, updateQuery4);
|
||||
dCollection.updateOne(searchQuery, updateQuery5);
|
||||
dCollection.updateOne(searchQuery, updateQuery6);
|
||||
dCollection.updateOne(searchQuery, updateQuery7);
|
||||
//delegationTimer.trigger();
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
} else {
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("clientid", ClientID);
|
||||
|
||||
BasicDBObject updateQuery = new BasicDBObject();
|
||||
BasicDBObject updateQuery1 = new BasicDBObject();
|
||||
updateQuery.append("$set",
|
||||
new BasicDBObject().append("type", 7));
|
||||
updateQuery1.append("$set",
|
||||
new BasicDBObject().append("status", true));
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
//delegationTimer.trigger();
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
System.out.println("Banned Account");
|
||||
@ -861,6 +882,7 @@ public class delegationServices {
|
||||
createForm.append("Token", tokenSTGEN);
|
||||
createForm.append("Control", 1);
|
||||
createForm.append("Upgrade", 0);
|
||||
createForm.append("Version", 2);
|
||||
//createForm.append("Uid",uid);
|
||||
createForm.append("lastNet", Macid);
|
||||
accountS.insertOne(createForm);
|
||||
@ -872,7 +894,7 @@ public class delegationServices {
|
||||
FNETDOC.insertOne(FnetInit);
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("clientid", ClientID);
|
||||
com.jamesquinley.Asecure.emailVerify.Onboarding(Email, User);
|
||||
electronicMailHandler.Onboarding(Email, User);
|
||||
BasicDBObject updateQuery = new BasicDBObject();
|
||||
BasicDBObject updateQuery1 = new BasicDBObject();
|
||||
updateQuery.append("$set",
|
||||
|
Reference in New Issue
Block a user