Handle same PID during the same day

passhportd/app/views.py

@@ -180,8 +180,8 @@ def checkandterminatesshsession():
     isodate    = datetime.now().isoformat().replace(":",""). \
                  replace("-","").split('.')[0]
     lentries = logentry.Logentry.query.filter(
-             logentry.Logentry.endsessiondate == None).all()
-
+               logentry.Logentry.endsessiondate == None).all()
+    
     if not lentries:
         return "No active connection."
 
@@ -236,14 +236,14 @@ def endsshsession(pid):
     # modify the associated Logentry to signal the end date
     isodate    = datetime.now().isoformat().replace(":",""). \
                  replace("-","").split('.')[0]
-    lentry = logentry.Logentry.query.filter(
-             logentry.Logentry.pid == int(pid)).first()
+    # taking the last connection with this PID (the most recent)
+    lentry = logentry.Logentry.query.filter(db.and_(
+             logentry.Logentry.pid == int(pid),
+             logentry.Logentry.endsessiondate == None)).first()
 
     if not lentry:
         return "Error: no logentry with this PID"
 
-    if lentry.endsessiondate:
-        return "Already ended"
     lentry.setenddate(isodate)
 
     try:
@@ -252,7 +252,8 @@ def endsshsession(pid):
         return utils.response('ERROR: "' + name + '" -> ' + e.message, 409)
 
     #At last change the root password if needed
-    lentry.target[0].changepass(isodate)
+    if lentry.target:
+        lentry.target[0].changepass(isodate)
 
     return "Done"