packages.txt aktualisiert

.idea/misc.xml

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (api)" project-jdk-type="Python SDK" />
+  <component name="Black">
+    <option name="sdkName" value="Python 3.9 (api)" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11" project-jdk-type="Python SDK" />
 </project>

.idea/sourcesync.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SourceSyncRemoteConfigurationsService"><![CDATA[{
+  "connections": [
+    {
+      "type": "ssh_configuration",
+      "name": "API-Server",
+      "hostname": "172.17.1.239",
+      "username": "root",
+      "remote_workspace_path": "/root"
+    }
+  ]
+}]]></component>
+</project>

Classes/main_classes.py

@@ -5,7 +5,6 @@ class CL_Ping_Set(BaseModel):
     name: str
     ipaddress: str
 
-
 class CL_Database_get(BaseModel):
     name: str
 
@@ -44,9 +43,35 @@ class CL_ADD_AD_USER(BaseModel):
     dbname: str
     entry: list
 
+class CL_ADD_REPORT_USER(BaseModel):
+    query: str
+    dbname: str
+
 class CL_GET_AD_GROUP_USER(BaseModel):
     query: str
     dbname: str
+
+class CL_GET_REPORT_GROUP(BaseModel):
+    group_name: str
+    dbname: str
+
+class CL_GET_USER_ID(BaseModel):
+    user: str
+    dbname: str
+
+class CL_ADD_USER_TO_GROUP(BaseModel):
+    dbname: str
+    member: str
+    groupname: str
+
+class CL_ADD_REPORT_GROUP(BaseModel):
+    user: str
+    dbname: str
+
+class CL_CHECK_DISABLED_USER(BaseModel):
+    user: str
+    dbname: str
+
 class CL_ADD_AD_GROUP(BaseModel):
     query: str
     dbname: str
@@ -65,12 +90,97 @@ class CL_GET_DATABASE(BaseModel):
     ip: str
 
 class CL_GET_VOLUMES(BaseModel):
-    name: str
-    database: str
+    user: str
+    dbname: str
 
 class CL_GET_CLIENT(BaseModel):
     name: str
 
+class CL_GET_HOST(BaseModel):
+    hostname: str
+    dbname: str
+
+class CL_SET_HOST_USER(BaseModel):
+    user: str
+    dbname: str
+    hardwareID: str
+
+class CL_GET_HOST_USER(BaseModel):
+    user: str
+    dbname: str
+
+class CL_SET_HOST(BaseModel):
+    hostname: str
+    user: str
+    ipadresse: str
+    winver: str
+    cpuname: str
+    cores: int
+    dbname: str
+    ram: int
+    hddfree: str
+    hddused: str
+    hddtotal: str
+    netvolumeuser: str
+
+class CL_GET_CPU(BaseModel):
+    hostname: str
+    cputype: str
+    cpuname: str
+    dbname: str
+
+class CL_SET_CPU(BaseModel):
+    hostname: str
+    cputype: str
+    ghz: str
+    cpuname: str
+    dbname: str
+
+class CL_UPDATE_HOST(BaseModel):
+    hostname: str
+    user: str
+    ipadresse: str
+    winver: str
+    cpuname: str
+    cores: int
+    dbname: str
+    ram: int
+    hddfree: str
+    hddused: str
+    hddtotal: str
+    netvolumeuser: str
+
+class CL_SET_LASTLOGON_USER(BaseModel):
+    userID: int
+    dbname: str
+    lastlogon: str
+
 class CL_ADD_CLIENT(BaseModel):
     query: str
     database: str
+
+class CL_GET_USER(BaseModel):
+    user: str
+    database: str
+
+class CL_GET_USER_CLIENT(BaseModel):
+    dbname: str
+    hostname: str
+
+class CL_ADD_GROUP_VOLUME(BaseModel):
+    label: str
+    path: str
+    letter: str
+    group: str
+    dbname: str
+
+class CL_ERROR_LOG(BaseModel):
+    datum: str
+    hostname: str
+    samaccountname: str
+    errorcode: str
+
+class CL_REPORTING(BaseModel):
+    username: str
+    lastaccess: str
+    ipaddress: str

main.py

@@ -66,9 +66,10 @@ async def database_get(get: CL.CL_Database_get,api_key: APIKey = Depends(auth.ge
     else:
         return False
 
-@app.post("/info/getvolume")
+@app.post("/host/get/netvolume")
 async def getvolume(get: CL.CL_GET_VOLUMES,api_key: APIKey = Depends(auth.get_api_key)):
-    result = database(f"SELECT `Netzlaufwerk_1`,`Netzlaufwerk_2`,`Netzlaufwerk_3`,`Netzlaufwerk_4`,`Netzlaufwerk_5`,`Netzlaufwerk_6`,`Netzlaufwerk_7`,`Netzlaufwerk_8`,`Netzlaufwerk_9`,`Netzlaufwerk_10` FROM `Clients` where `Name` = '{get.name}'",f"{get.database}","")
+    ## Anpassung zum neune Schema erstellen
+    result = database(f"SELECT `{get.dbname}`.Netvolume.Volume_Path, `{get.dbname}`.Netvolume.Volume_Key, `{get.dbname}`.Netvolume.Volume_Name FROM `{get.dbname}`.`Active-Directory-User` INNER JOIN `{get.dbname}`.GruppenToADUser ON `{get.dbname}`.GruppenToADUser.ADUserID = `{get.dbname}`.`Active-Directory-User`.ID INNER JOIN `{get.dbname}`.Gruppen ON `{get.dbname}`.GruppenToADUser.GruppenID = `{get.dbname}`.Gruppen.id INNER JOIN `{get.dbname}`.GruppenToNetvolumes ON `{get.dbname}`.GruppenToNetvolumes.GruppenID = `{get.dbname}`.Gruppen.id INNER JOIN `{get.dbname}`.Netvolume ON `{get.dbname}`.GruppenToNetvolumes.NetvolumeID = `{get.dbname}`.Netvolume.ID WHERE `{get.dbname}`.`Active-Directory-User`.SamAccountName = '{get.user}' ORDER BY `{get.dbname}`.`Active-Directory-User`.SamAccountName DESC","","")
     volume = []
     if not result:
         return False
@@ -77,6 +78,106 @@ async def getvolume(get: CL.CL_GET_VOLUMES,api_key: APIKey = Depends(auth.get_ap
             volume.append(i)
         return volume
 
+@app.post("/info/getuser")
+async def getuser(get: CL.CL_GET_USER,api_key: APIKey = Depends(auth.get_api_key)):
+    result = database(f"SELECT `disabled` FROM `Active-Directory-RDS-User` where `SamAccountName` = '{get.user}'",f"{get.database}","")
+    if not result:
+        return False
+    else:
+        return result[0][0]
+
+@app.post("/host/get")
+async def gethost(get: CL.CL_GET_HOST,api_key: APIKey = Depends(auth.get_api_key)):
+    result = database(f"SELECT id FROM `Clients` where `Host-Name` = '{get.hostname}'",f"{get.dbname}","")
+    if not result:
+        return False
+    else:
+        return result[0][0]
+
+@app.post("/host/get/cpu")
+async def getcpu(get: CL.CL_GET_CPU,api_key: APIKey = Depends(auth.get_api_key)):
+    result = database(
+        f"SELECT id FROM `{get.dbname}`.cpulist WHERE cpuname = '{get.cpuname} AND cputyp = {get.cputype}')",
+        "", "")
+    if not result:
+        return False
+    else:
+        return result[0][0]
+
+@app.post("/host/get/database")
+async def getdatabase(get: CL.CL_GET_DATABASE,api_key: APIKey = Depends(auth.get_api_key)):
+    result = database(f"SELECT Datenbank FROM `Kunden` where `Subnetz` = '{get.ip}'","Stines-GmbH","")
+    print(result[0][0])
+    if not result:
+        return False
+    else:
+        return result[0][0]
+
+@app.post("/host/set")
+async def sethost(get: CL.CL_SET_HOST,api_key: APIKey = Depends(auth.get_api_key)):
+    database(f"INSERT INTO `{get.dbname}`.Clients (`Host-Name`,SamAccountName,`IP-Adresse`,`Windows-Version`,`CPU-Name`,`Prozessor-Anzahl`,RAM,Speichergesamt,Speicherfrei,Speicherbelegt, NetVolumeUser) VALUES ('{get.hostname}','{get.user}','{get.ipadresse}','{get.winver}','{get.cpuname}','{get.cores}','{get.ram}','{get.hddtotal}','{get.hddfree}','{get.hddused}',{get.netvolumeuser})","","")
+    hostid = database(
+        f"SELECT id FROM `{get.dbname}`.Clients WHERE `Host-Name` = '{get.hostname}'",
+        "", "")
+    userid = database(
+        f"SELECT id FROM `{get.dbname}`.User WHERE `SamAccountName` = '{get.user}'",
+        "", "")
+    if not userid:
+        userid = database(
+            f"SELECT id FROM `{get.dbname}`.`Active-Directory-User` WHERE `SamAccountName` = '{get.user}'",
+            "", "")
+    database(f"INSERT INTO `{get.dbname}`.ClientsToUser (clientsid,userid) VALUES ({hostid},{userid})","","")
+    if not hostid:
+        return False
+    else:
+        return hostid[0][0]
+
+# @app.post("/host/cpu")
+# async def setcpu(get: CL.CL_SET_CPU,api_key: APIKey = Depends(auth.get_api_key)):
+#     check = database(f"SELECT id FROM `{get.dbname}`.cpulist WHERE cpuname = '{get.cpuname}' AND ghz")
+#     database(f"INSERT INTO `{get.dbname}`.cpulist (cpuname,ghz,cputyp) VALUES ('{get.cpuname}','{get.ghz}','{get.cputyp}')","","")
+#     result = database(
+#         f"SELECT id FROM `{get.dbname}`.cpulist WHERE cpuname = '{get.cpuname} AND cputyp = {get.cputyp}')",
+#         "", "")
+#     database(
+#         f"INSERT INTO `{get.dbname}`.cpu_to_client (hardwareID,cpulistID) VALUES ('{get.hardwareID}','{result[0][0]}',)",
+#         "", "")
+#     if not result:
+#         return False
+#     else:
+#         return result[0][0]
+
+@app.post("/host/update")
+async def updatehost(get: CL.CL_UPDATE_HOST,api_key: APIKey = Depends(auth.get_api_key)):
+    database(f"UPDATE `{get.dbname}`.Clients SET SamAccountName = '{get.user}',`IP-Adresse` = '{get.ipadresse}',`Windows-Version` = '{get.winver}',`CPU-Name` = '{get.cpuname}',`Prozessor-Anzahl` = {get.cores},RAM = {get.ram},Speichergesamt = '{get.hddtotal}',Speicherfrei = '{get.hddfree}',Speicherbelegt = '{get.hddused}',NetVolumeUser = '{get.netvolumeuser}', LastChange = '{datetime.now()}' WHERE `Host-Name` = '{get.hostname}'","","")
+    result = database(f"SELECT id FROM `{get.dbname}`.Clients WHERE `Host-Name` = '{get.hostname}'","", "")
+    if not result:
+        return False
+    else:
+        return result[0][0]
+
+@app.post("/user/set")
+async def set_user(get: CL.CL_SET_HOST_USER,api_key: APIKey = Depends(auth.get_api_key)):
+    result = database(f"INSERT INTO `{get.dbname}`.ClientsUser (SamAccountName) VALUES ('{get.user}')","","")
+    if not result:
+        return False
+    else:
+        return result
+
+@app.post("/user/get")
+async def get_user(get: CL.CL_GET_HOST_USER,api_key: APIKey = Depends(auth.get_api_key)):
+    result = database(f"SELECT id FROM `{get.dbname}`.`Active-Directory-User` WHERE SamAccountName = '{get.user}' ORDER BY ID DESC LIMIT 1","","")
+    if not result:
+        result = database(
+            f"SELECT id FROM `{get.dbname}`.`Clients` WHERE SamAccountName = '{get.user}' ORDER BY ID DESC LIMIT 1",
+            "", "")
+    return result[0][0]
+
+@app.post("/user/set/lastlogon")
+async def set_lastlogon_user(get: CL.CL_SET_LASTLOGON_USER,api_key: APIKey = Depends(auth.get_api_key)):
+    database(f"INSERT INTO `{get.dbname}`.LastLogonToADUser (aduserid,lastlogon) VALUES ('{get.userID}','{get.lastlogon}')", "", "")
+
+
 @app.post("/info/getclient")
 async def getclient(get: CL.CL_GET_CLIENT,api_key: APIKey = Depends(auth.get_api_key)):
     result = database(f"SELECT Firma FROM `Kunden-Clients` where `Client-Name` = '{get.name}'","Stines-GmbH","")
@@ -85,6 +186,15 @@ async def getclient(get: CL.CL_GET_CLIENT,api_key: APIKey = Depends(auth.get_api
     else:
         return result[0][0]
 
+@app.post("/client/user/get")
+async def getclient(get: CL.CL_GET_USER_CLIENT,api_key: APIKey = Depends(auth.get_api_key)):
+    result = database(f"SELECT NetVolumeUser FROM `{get.dbname}`.`Clients` where `Host-Name` = '{get.hostname}'","","")
+    if not result:
+        return False
+    else:
+        return result[0][0]
+
+
 @app.post("/info/addclient")
 async def addclient(addclient: CL.CL_ADD_CLIENT,api_key: APIKey = Depends(auth.get_api_key)):
     print(addclient.query)
@@ -135,6 +245,61 @@ async def add_ad_user(get: CL.CL_ADD_AD_USER,api_key: APIKey = Depends(auth.get_
     print(database(get.query,get.dbname,get.entry))
     return f"Create {get.query} - {get.dbname}"
 
+@app.post("/ad/reportadduser")
+async def add_report_user(get: CL.CL_ADD_REPORT_USER,api_key: APIKey = Depends(auth.get_api_key)):
+    print(database(get.query,get.dbname,""))
+    return f"Create {get.query} - {get.dbname}"
+
+@app.post("/ad/user/disabled")
+async def disabled_user(get: CL.CL_CHECK_DISABLED_USER,api_key: APIKey = Depends(auth.get_api_key)):
+    result = database(f"SELECT `{get.dbname}`.`Gruppen`.`Name` ,`{get.dbname}`.`GruppenToADUser`.`Deaktiviert` from `{get.dbname}`.`Active-Directory-User` INNER join `{get.dbname}`.`GruppenToADUser` on `{get.dbname}`.`Active-Directory-User`.`ID` = `{get.dbname}`.`GruppenToADUser`.`ADUserID` INNER join`{get.dbname}`.`Gruppen` on `{get.dbname}`.`Gruppen`.`ID` = `{get.dbname}`.`GruppenToADUser`.`GruppenID` WHERE `{get.dbname}`.`Active-Directory-User`.`SamAccountName` = '{get.user}'",f"{get.dbname}","")
+    return result
+
+@app.post("/report/getgroup")
+async def get_report_group(get: CL.CL_GET_REPORT_GROUP,api_key: APIKey = Depends(auth.get_api_key)):
+    result = database(f"SELECT ID FROM `{get.dbname}`.`Gruppen` WHERE Name = '{get.group_name}'","","")
+    print(result)
+    if not result:
+        return False
+    else:
+        return result[0][0]
+
+@app.post("/report/getuserid")
+async def get_user_id(get: CL.CL_GET_USER_ID,api_key: APIKey = Depends(auth.get_api_key)):
+    result = database(f"SELECT ID FROM `{get.dbname}`.`Active-Directory-User` WHERE SamAccountName = '{get.user}'","","")
+    if not result:
+        return False
+    else:
+        return result[0][0]
+
+@app.post("/report/addusertogroup")
+async def get_addusertogroup(get: CL.CL_ADD_USER_TO_GROUP,api_key: APIKey = Depends(auth.get_api_key)):
+    userid = database(f"SELECT ID FROM `{get.dbname}`.`Active-Directory-User` WHERE SamAccountName = '{get.member}' ORDER BY ID DESC LIMIT 1","","")[0][0]
+    groupid = database(f"SELECT ID FROM `{get.dbname}`.Gruppen WHERE Name = '{get.groupname}'","","")
+    if not groupid:
+        database(f"INSERT INTO `{get.dbname}`.Gruppen (Name) VALUES ('{get.groupname}')","","")
+        groupid = database(f"SELECT ID FROM `{get.dbname}`.Gruppen WHERE Name = '{get.groupname}'", "", "")[0][0]
+    check = database(f"SELECT * FROM `{get.dbname}`.GruppenToADUser WHERE ADUserID = {userid} AND GruppenID = {groupid[0][0]}","","")
+    if not check:
+        database(f"INSERT INTO `{get.dbname}`.GruppenToADUser (ADUserID,GruppenID) VALUES ({userid},{groupid[0][0]})","","")
+    else:
+        newid = database(f"SELECT db1.ID FROM `{get.dbname}`.`Active-Directory-User` as db1 WHERE db1.SamAccountName = '{get.member}' ORDER BY ID DESC LIMIT 1","","")
+        print(newid)
+        oldid = database(f"SELECT gtu.ADUserID FROM `{get.dbname}`.GruppenToADUser as gtu INNER JOIN `{get.dbname}`.`Active-Directory-User` as db2 ON gtu.ADUserID = db2.id WHERE db2.SamAccountName = '{get.member}' LIMIT 1","","")
+        print(oldid)
+        database(f"UPDATE `{get.dbname}`.GruppenToADUser as gtu SET gtu.ADUserID = '{newid[0][0]}' WHERE gtu.ADUserID = '{oldid[0][0]}'","","")
+        return check
+
+@app.post("/report/addgroup")
+async def get_addreport_group(get: CL.CL_ADD_REPORT_GROUP,api_key: APIKey = Depends(auth.get_api_key)):
+    print(database(get.query,get.dbname,""))
+    return f"Create {get.query} - {get.dbname}"
+
+@app.post("/report/errorlog")
+async def get_errorlog(get: CL.CL_ERROR_LOG,api_key: APIKey = Depends(auth.get_api_key)):
+    print(database(f"INSERT INTO {get.dname}.ERROR_LOG (datum,hostname,samaccouuntname,fehlercode) VALUES ({get.datum},{get.hostname},{get.user},{get.errocode})","",""))
+    return f"ADD {get.errocode} - {get.hostname}"
+
 @app.post("/ad/addgroup")
 async def add_ad_user(get: CL.CL_ADD_AD_GROUP,api_key: APIKey = Depends(auth.get_api_key)):
     print(database(get.query,get.dbname,get.entry))
@@ -145,11 +310,52 @@ async def add_ad_user(get: CL.CL_ADD_EX_USER,api_key: APIKey = Depends(auth.get_
     print(database(get.query,get.dbname,get.entry))
     return f"Create {get.query} - {get.dbname}"
 
+@app.post("/add/group/volume")
+async def send_group_volume(get: CL.CL_ADD_GROUP_VOLUME,api_key: APIKey = Depends(auth.get_api_key)):
+    volume_id = database(f"SELECT ID FROM Netvolume WHERE Volume_Path = '{get.path}' AND Volume_Name = '{get.label}'", f"{get.dbname}", "")
+    if not volume_id:
+        database(f"INSERT INTO `{get.dbname}`.Netvolume (Volume_Key,Volume_Path,Volume_Name) VALUES ('{get.letter}','{get.path}','{get.label}')", "",
+                 "")
+    group_id = database(f"SELECT GruppenID FROM GruppenToNetvolumes WHERE NetvolumeID = '{volume_id[0][0]}'", f"{get.dbname}", "")
+    if not group_id:
+        group_id = database(f"SELECT ID FROM `{get.dbname}`.Gruppen WHERE Name = '{get.group}'", "","")
+        if not group_id:
+            group_id = database(f"SELECT ID FROM `{get.dbname}`.`Active-Directory-User` WHERE SamAccountName = '{get.group}' ORDER BY ID DESC LIMIT 1", "", "")
+            database(f"INSERT INTO `{get.dbname}`.GruppenToNetvolumes (UserID,NetvolumeID) VALUES ('{group_id[0][0]}','{volume_id[0][0]}')", "","")
+        else:
+            database(
+                f"INSERT INTO `{get.dbname}`.GruppenToNetvolumes (GruppenID,NetvolumeID) VALUES ('{group_id[0][0]}','{volume_id[0][0]}')",
+                "", "")
+    # database(get.query,get.dbname,get.entry)
+    return f"Create {get.label} - {get.path}"
+
+
 @app.post("/volume_mount")
 async def volume_mount(get: CL.CL_GET_VOLUME,api_key: APIKey = Depends(auth.get_api_key)):
     database(f"INSERT INTO `Volume-Mount` (date,user) VALUES ('{get.date}','{get.user}')","Stines-GmbH","")
     return f"User {get.user} ADD"
 
+@app.post("/report")
+async def reporting(get: CL.CL_REPORTING,api_key: APIKey = Depends(auth.get_api_key)):
+    print(f"{get.username}")
+    print(f"{get.lastaccess}")
+    print(f"{get.ipaddress}")
+    user_check = database(f"SELECT username from users where username = '{get.username}'","Kunden","")
+    if not user_check:
+        print("User not exist")
+        # TBD add Message to Admin by Gotify or E-Mail
+    else:
+        entry = database(f"SELECT s.customer_ID,s.service_ID from `server` s where s.privat_ipaddress LIKE '%{get.ipaddress}%'","Kunden","")
+        customer_ID = entry[0][0]
+        service_ID = entry[0][1]
+        reportingdate = datetime.now()
+        reportingdate = reportingdate.strftime("%Y-%m-%d %H:%M:%S")
+        print(reportingdate)
+        database(f"INSERT INTO `services.reporting` (username,service_ID,customer_ID,reportingdate,lastaccess) VALUES ('{get.username}','{service_ID}','{customer_ID}','{reportingdate}','{get.lastaccess}')","Kunden","")
+        print(f"INSERT INTO `services.reporting` (username,service_ID,customer_ID,reportingdate,lastaccess) VALUES ('{get.username}','{service_ID}','{customer_ID}','{reportingdate}','{get.lastaccess}')","Kunden","")
+        print(f"{service_ID} - {customer_ID}")
+
+
 ## Startet den API-Server
 if __name__ == '__main__':
     uvicorn.run("main:app", host='0.0.0.0', port=8001, reload=True, log_level="debug")