-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
-Added ability to change password.
- Loading branch information
Scratchcat1
authored
Nov 7, 2017
1 parent
82c9995
commit f0e8b25
Showing
14 changed files
with
387 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,267 @@ | ||
| import codecs,ast,AATC_DB | ||
| def GetTime(): | ||
| return int(time.time()) | ||
|
|
||
| def CoordLessThanOrEqual(Coord1,Coord2):# True if Coord1 <= Coord2 | ||
| List1 = list(Coord1) | ||
| List2 = list(Coord2) | ||
| BoolList = [] | ||
| for x in range(len(List1)): #Goes through each item in the lists | ||
| if List1[x] <= List2[x]: #If The Coord1[x] <= Coord2[x] | ||
| BoolList.append(True) | ||
| return all(BoolList) | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| class UserConnection: | ||
| def __init__(self,Connection): | ||
| self.DB = AATC_DB.DBConnection() | ||
| self.con = Connection | ||
| self.UserID = -1 #Used to identify if has logged in yet | ||
| def Send(self,data): | ||
| self.con.sendall(codecs.encode(str(data))) | ||
| def Recv(self): | ||
| try: | ||
| data = sel.con.recv(1024) | ||
| data = ast.literal_eval(codecs.decode(data)) | ||
| # (Command,Arguments) | ||
| return data | ||
| #return data[0],data[1],data[2] | ||
| except Exception as e: | ||
| print("Socket data recive error") | ||
| print(str(e)) | ||
|
|
||
| def Connection_Loop(self): | ||
| """ | ||
| Keeps looping in request for user, | ||
| Recived data in format (CommandString,(Arg1,Arg2...)) | ||
| Calls function in format FunctionX(ArgumentTuple) | ||
| This is to move argument processing to the specific Section | ||
| UserID is passed as argument on server side only for security | ||
| Arguments may be converted from Tuple to Dict in future for clarity | ||
| """ | ||
| while self.UserID == -1:#Repeats until logs in | ||
| data = self.Recv() | ||
| Command,Arguments = data[0],data[1] | ||
| if Command == "Login": | ||
| self.Login(Arguments) | ||
| elif Command == "AddUser": # If adding a new user, one must create it first, then log in seperatly | ||
| self.AddUser(Arguments) | ||
|
|
||
| Exit = False | ||
| while not Exit: | ||
| data = self.Recv() | ||
| Command,Arguments = data[0],data[1] | ||
| if Command == "GetNoFlyZones": | ||
| self.GetNoFlyZones(Arguments) | ||
| elif Command == "AddNoFlyZone": | ||
| self.GetNoFlyZones(Arguments) | ||
| elif Command == "RemoveNoFlyZone": | ||
| self.RemoveNoFlyZone(Arguments) | ||
| elif Command == "ModifyNoFlyZone": | ||
| self.ModifyNoFlyZone(Arguments) | ||
|
|
||
| elif Command == "AddDrone": | ||
| self.AddDrone(Arguments) | ||
| elif Command == "GetDronesUser": | ||
| self.GetDronesUser(Arguments) | ||
| elif Command == "GetDronesAll": | ||
| self.GetDronesAll(Arguments) | ||
|
|
||
| elif Command == "GetUsername": | ||
| self.GetUsername(Arguments) | ||
| elif Command == "SetUserPublicVisibleFlights": | ||
| self.SetUserPublicVisibleFlights(Arguments) | ||
| elif Command == "SetAccountType": | ||
| self.SetAccountType(Arguments) | ||
|
|
||
| elif Command == "GetFlightsUser": | ||
| self.GetFlightsUser(Arguments) | ||
| elif Command == "GetFlightsAll": | ||
| self.GetFlightsAll(Arguments) | ||
| elif Command == "AddFlight": | ||
| self.AddFlight(Arguments) | ||
| elif Command == "RemoveFlight": | ||
| self.RemoveFlight(Arguments) | ||
|
|
||
| elif Command == "GetFlightWaypointsUser": | ||
| self.GetFlightWaypointsUser(Arguments) | ||
| elif Command == "GetFlightWaypointsAll": | ||
| self.GetFlightWaypointsAll(Arguments) | ||
|
|
||
| elif Command == "GetMonitorID": | ||
| self.GetMonitorID(Arguments) | ||
| elif Command == "GetMonitorName": | ||
| self.GetMonitorName(Arguments) | ||
|
|
||
| elif Command == "AddMonitorPermission": | ||
| self.AddMonitorPermission(Arguments) | ||
| elif Command == "RemoveMonitorPermission": | ||
| self.RemoveMonitorPermission(Arguments) | ||
| elif Command == "ModifyMonitorPermissionDate": | ||
| self.ModifyMonitorPermissionDate(Arguments) | ||
| elif Command == "GetMonitorPermissionUser": | ||
| self.GetMonitorPermissionUser(Arguments) | ||
| #Else if command doesnt exist send back Failure | ||
| else: | ||
| self.Send((False,"Command does not exist")) | ||
| print("User tried to use unregistered command") | ||
|
|
||
|
|
||
| def Login(self,Arguments): | ||
| Username,Password = Arguments[0],Arguments[1] | ||
| Sucess,Message,self.UserID = self.DB.CheckCredentials(Username,Password) | ||
|
|
||
| ######################################################## | ||
| def GetNoFlyZones(self,Arguments = None): | ||
| Sucess,Message,Data = self.DB.GetNoFlyZones() | ||
| self.SendData((Sucess,Message,Data)) | ||
|
|
||
| def AddNoFlyZone(self,Arguments): | ||
| if len(Arguments) == 3: | ||
| Coord1,Coord2,Level = Argument[0],Argument[1],Argument[2] | ||
| Sucess,Message = self.DB.AddNoFlyZone(Coord1,Coord2,Level,self.UserID) | ||
| else: | ||
| Sucess,Message = False,"Incorrect Argument format" | ||
| self.SendData((Sucess,Message)) | ||
|
|
||
| def RemoveNoFlyZone(self,Arguments): | ||
| ZoneID = Arguments[0] | ||
| Sucess,Message = self.DB.RemoveNoFlyZone(self.UserID,ZoneID) | ||
| self.SendData((Sucess,Message)) | ||
| def ModifyNoFlyZoneLevel(self,Arguments): | ||
| ZoneID = Arguments[0] | ||
| Sucess,Message = self.DB.ModifyNoFlyZoneLevel(self.UserID,ZoneID,Level) | ||
| self.SendData((Sucess,Message)) | ||
|
|
||
|
|
||
| ######################################################## | ||
| def AddDrone(self,Arguments): | ||
| DroneName,DroneType,DroneSpeed,DroneRange,DroneWeight = Arguments[0],Arguments[1],Arguments[2],Arguments[3],Arguments[4] | ||
| Sucess,Message = self.DB.AddDrone(self.UserID,DroneName,DroneType,DroneSpeed,DroneRange,DroneWeight) | ||
| self.SendData((Sucess,Message)) | ||
| def RemoveDrone(self,Arguments): | ||
| DroneID = Arguments[0] | ||
| Sucess,Message = self.DB.RemoveDrone(self.UserID,DroneID) | ||
| self.SendData((Sucess,Message)) | ||
| def GetDronesUser(self,Arguments = None): | ||
| Sucess,Message,Data = self.DB.GetDronesUser(self.UserID) | ||
| self.SendData((Sucess,Message,Data)) | ||
| def GetDronesAll(self,Arguments = None): | ||
| Sucess,Message,Data = self.DB.GetDronesAll() | ||
| self.SendData((Sucess,Message,Data)) | ||
| ######################################################## | ||
|
|
||
| ## def GetUserID(self,Argument): | ||
| ## def CheckCredentials(self,Arguments): | ||
| def GetUsername(self,Arguments): | ||
| UserID = Arguments[0] | ||
| Sucess,Message,Data = self.DB.GetUsername(UserID) | ||
| self.SendData((Sucess,Message,Data)) | ||
|
|
||
| def AddUser(self,Arguments): | ||
| Username,Password = Arguments[0],Arguments[1] | ||
| Sucess,Message = self.DB.AddUser(Username,Password) | ||
| self.SendData((Sucess,Message)) | ||
|
|
||
| def SetUserPublicVisibleFlights(self,Arguments): | ||
| Value = Arguments[0] | ||
| Sucess,Message = self.DB.SetUserPublicVisibleFlights(self.UserID,Value) | ||
| self.SendData((Sucess,Message)) | ||
|
|
||
| def SetAccountType(self,Arguments): | ||
| Value = Arguments[0] | ||
| Sucess,Message = self.DB.SetAccountType(self.UserID,Value) | ||
| self.SendData((Sucess,Message)) | ||
|
|
||
| ####################################################### | ||
|
|
||
|
|
||
| def GetFlightsUser(self,Arguments = None): | ||
| Sucess,Message,Data = self.DB.GetFlightsUser(self.UserID) | ||
| self.SendData((Sucess,Message,Data)) | ||
|
|
||
| def GetFlightsAll(self,Arguments = None): | ||
| Sucess,Message,Data = self.DB.GetFlightsAll() | ||
| self.SendData((Sucess,Message,Data)) | ||
|
|
||
| def AddFlight(self,Arguments): | ||
| DroneID,StartCoords,EndCoords,StartTime = Arguments[0],Arguments[1],Arguments[2],Arguments[3] | ||
| #Stuff I still need to do | ||
| #Eg add to tempoary PrebookFlight Table | ||
| #User pathfinding to translate to Waypoints,Flight and remove from table | ||
|
|
||
| def RemoveFlight(self,Arguments): | ||
| FlightID = Arguments[0] | ||
| Sucess,Message = self.DB.RemoveFlight(self.UserID,FlightID) | ||
| self.SendData((Sucess,Message)) | ||
| ####################################################### | ||
|
|
||
| def GetFlightWaypointsUser(self,Arguments = None): | ||
| Sucess,Message,Data = self.DB.GetFlightWaypointsUser(self.UserID) | ||
| self.SendData((Sucess,Message,Data)) | ||
|
|
||
| def GetFlightWaypointsAll(self,Arguments = None): | ||
| Sucess,Message,Data = self.DB.GetFlightWaypointsAll() | ||
| self.SendData((Sucess,Message,Data)) | ||
| ####################################################### | ||
|
|
||
| def GetMonitorID(self,Arguments): | ||
| MonitorName = Arguments[0] | ||
| Sucess,Message,Data = self.DB.GetMonitorID(MonitorName) | ||
| self.SendData((Sucess,Message,Data)) | ||
|
|
||
| def GetMonitorName(self,Arguments): | ||
| MonitorID = Arguments[0] | ||
| Sucess,Message,Data = self.DB.GetMonitorName(MonitorID) | ||
| self.SendData((Sucess,Message,Data)) | ||
|
|
||
| ####################################################### | ||
|
|
||
| def AddMonitorPermission(self,Arguments): | ||
| MonitorID,ExpiryDate = Arguments[0],Arguments[1] | ||
| Sucess,Message = self.DB.AddMonitorPermission(self.UserID,MonitorID,ExpiryDate) | ||
| self.SendData((Sucess,Message)) | ||
|
|
||
| def RemoveMonitorPermission(self,Arguments): | ||
| MonitorID = Arguments[0] | ||
| Sucess,Message = self.DB.RemoveMonitorPermission(self.UserID,MonitorID) | ||
| self.SendData((Sucess,Message)) | ||
|
|
||
| def ModifyMonitorPermissionDate(self,Arguments): | ||
| MonitorID,NewDate = Arguments[0],Arguments[1] | ||
| Sucess,Message = self.DB.ModifyMonitorPermissionDate(self.UserID,MonitorID,NewDate) | ||
| self.SendData((Sucess,Message)) | ||
|
|
||
| def GetMonitorPermissionUser(self,Arguments = None): | ||
| Sucess,Message,Data = self.DB.GetMonitorPermissionUser(self.UserID) | ||
| self.SendData((Sucess,Message,Data)) | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.