CHANGELOG.md

@@ -6,24 +6,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [5.1.1] - 2025-05-06
-
-### Fixed
-
-- Fixed URL for notifying stop to ogcore
-
-## [5.1.0] - 2025-05-06
-
-### Added
-
-- Added powershell helper script for logging out from windows
-
-## [5.0.0] - 2025-05-06
-
-### Added
-
-- Use TLS
-
 ## [4.0.0] - 2025-04-24
 
 ### Added

doc/scheduled-task/scheduled-task.md

@@ -1,47 +0,0 @@
-## Crear tarea programada para matar el agente de Windows al cerrar sesión
-
-1. Abrir el task scheduler y pinchar en Create task:
-
-![image info](./sched01.png)
-
-2. Rellenar el nombre y luego pinchar en Change user or group:
-
-![image info](./sched02.png)
-
-3. Pinchar en Advanced:
-
-![image info](./sched03.png)
-
-4. Pinchar en Find now:
-
-![image info](./sched04.png)
-
-5. Seleccionar Administrator y luego Ok, y luego Ok:
-
-![image info](./sched05.png)
-
-6. De vuelta en la pantalla de crear tarea, ir a la pestaña Triggers y pinchar en New:
-
-![image info](./sched06.png)
-
-7. Seleccionar "On disconnect from user session", seleccionar "Connection from local computer", y luego Ok:
-
-![image info](./sched07.png)
-
-8. Ir a la pestaña "Actions" y pinchar en New:
-
-![image info](./sched08.png)
-
-9. Pinchar en Browse, seleccionar C:\Program Files (x86)\OGAgent\stop-agent.ps1, y luego Ok:
-
-![image info](./sched09.png)
-
-10. Ir a la pestaña Conditions y desmarcar las condiciones relativas a Power:
-
-![image info](./sched10.png)
-
-11. Pinchar Ok y la tarea programada queda creada.
-
-En caso de usar remotepc, hay que repetir todos estos pasos, es decir, crear una
-tarea programada nueva, seleccionando "Connection from remote computer" en lugar
-de "Connection from local computer".

linux/debian/changelog

@@ -1,21 +1,3 @@
-ogagent (5.1.1-1) stable; urgency=medium
-
-  * Fix URL for notifying stop to ogcore
-
- -- OpenGnsys developers <info@opengnsys.es>  Tue, 06 May 2025 13:31:48 +0200
-
-ogagent (5.1.0-1) stable; urgency=medium
-
-  * Include powershell helper script for logging out of windows
-
- -- OpenGnsys developers <info@opengnsys.es>  Tue, 06 May 2025 13:30:59 +0200
-
-ogagent (5.0.0-1) stable; urgency=medium
-
-  * Use TLS
-
- -- OpenGnsys developers <info@opengnsys.es>  Fri, 25 Apr 2025 13:09:49 +0200
-
 ogagent (4.0.0-1) stable; urgency=medium
 
   * Handle authn/authz in the oglive agent

src/OGAgent.spec

@@ -99,4 +99,3 @@ coll = COLLECT(
 
 import shutil
 shutil.copytree ('cfg', '{}/{}/cfg'.format(DISTPATH, dist_name))
-shutil.copy     ('stop-agent.ps1', '{}/{}/stop-agent.ps1'.format(DISTPATH, dist_name))

src/VERSION

@@ -1 +1 @@
-5.1.1
+4.0.0

src/cfg/ogagent.cfg

@@ -17,12 +17,6 @@ level=full
 # Log Level, if omitted, will be set to INFO
 log=DEBUG
 
-# TLS
-ca=C:\Program Files (x86)\OGagent\ca.crt
-crt=C:\Program Files (x86)\OGagent\ogagent.crt
-key=C:\Program Files (x86)\OGagent\ogagent.key
-
-
 # Module specific
 # The sections must match the module name
 # This section will be passes on activation to module
@@ -34,8 +28,3 @@ log=DEBUG
 pathinterface=/opt/opengnsys/interfaceAdm
 urlMenu={}://{}/menu-browser
 urlMsg=http://localhost/cgi-bin/httpd-log.sh
-
-# TLS
-ca=/opt/opengnsys/etc/ca.crt
-crt=/opt/opengnsys/etc/ogagent.crt
-key=/opt/opengnsys/etc/ogagent.key

src/opengnsys/RESTApi.py

@@ -34,7 +34,6 @@
 
 
 
-import os
 import requests
 import logging
 import json
@@ -44,6 +43,7 @@ from .log import logger
 
 from .utils import exceptionToMessage
 
+VERIFY_CERT = False  # Do not check server certificate
 TIMEOUT = 5  # Connection timout, in seconds
 
 
@@ -88,7 +88,7 @@ class REST(object):
          the deserialized JSON result or raises an exception in case of error 
     """
 
-    def __init__(self, url, ca_file=None, crt_file=None, key_file=None):
+    def __init__(self, url):
         """
         Initializes the REST helper
         url is the full url of the REST API Base, as for example "https://example.com/rest/v1".
@@ -105,26 +105,6 @@ class REST(object):
         except Exception:
             self.newerRequestLib = False  # I no version, guess this must be an old requests
 
-        if not self.newerRequestLib:
-            logger.debug ('TLS not available: python requests library is old')
-
-        self.use_tls = url.startswith ('https')
-        if self.use_tls:
-            if not ca_file or not crt_file or not key_file:
-                raise Exception ('missing TLS parameters in REST constructor')
-
-            errs = 0
-            for f in [ca_file, crt_file, key_file]:
-                if not os.path.exists (f):
-                    logger.error (f'{f}: No such file or directory')
-                    errs += 1
-            if errs:
-                raise Exception ('TLS files not found')
-
-        self.ca_file  = ca_file
-        self.crt_file = crt_file
-        self.key_file = key_file
-
         # Disable logging requests messages except for errors, ...
         logging.getLogger("requests").setLevel(logging.CRITICAL)
         # Tries to disable all warnings
@@ -155,19 +135,14 @@ class REST(object):
                 logger.debug('Requesting using GET (no data provided) {}'.format(url))
                 # Old requests version does not support verify, but it do not checks ssl certificate by default
                 if self.newerRequestLib:
-                    if self.use_tls:
+                    r = requests.get(url, verify=VERIFY_CERT, timeout=TIMEOUT)
-                        r = requests.get(url, cert=(self.crt_file, self.key_file), verify=self.ca_file, timeout=TIMEOUT)
-                    else:
-                        r = requests.get(url, timeout=TIMEOUT)
                 else:
                     r = requests.get(url)
             else:  # POST
                 logger.debug('Requesting using POST {}, data: {}'.format(url, data))
                 if self.newerRequestLib:
-                    if self.use_tls:
+                    r = requests.post(url, data=data, headers={'content-type': 'application/json'},
-                        r = requests.post(url, data=data, headers={'content-type': 'application/json'}, cert=(self.crt_file, self.key_file), verify=self.ca_file, timeout=TIMEOUT)
+                                      verify=VERIFY_CERT, timeout=TIMEOUT)
-                    else:
-                        r = requests.post(url, data=data, headers={'content-type': 'application/json'}, timeout=TIMEOUT)
                 else:
                     r = requests.post(url, data=data, headers={'content-type': 'application/json'})
 

src/opengnsys/modules/server/OpenGnSys/__init__.py

@@ -131,13 +131,10 @@ class OpenGnSysWorker(ServerWorker):
         # Ensure cfg has required configuration variables or an exception will be thrown
         try:
             url = self.service.config.get(self.name, 'remote')
-            ca_file  = self.service.config.get(self.name, 'ca')
-            crt_file = self.service.config.get(self.name, 'crt')
-            key_file = self.service.config.get(self.name, 'key')
         except NoOptionError as e:
             logger.error("Configuration error: {}".format(e))
             raise e
-        self.REST = REST (url, ca_file=ca_file, crt_file=crt_file, key_file=key_file)
+        self.REST = REST(url)
         # Execution level ('full' by default)
         try:
             self.exec_level = self.service.config.get(self.name, 'level')
@@ -177,7 +174,7 @@ class OpenGnSysWorker(ServerWorker):
                     logger.warn (str (e))
                     # Trying to initialize on alternative server, if defined
                     # (used in "exam mode" from the University of Seville)
-                    self.REST = REST(self.service.config.get(self.name, 'altremote'), ca_file=ca_file, crt_file=crt_file, key_file=key_file)
+                    self.REST = REST(self.service.config.get(self.name, 'altremote'))
                     self.REST.sendMessage('ogagent/started', {'mac': self.interface.mac, 'ip': self.interface.ip,
                                                               'secret': self.random, 'ostype': operations.os_type,
                                                               'osversion': operations.os_version, 'alt_url': True,

src/opengnsys/modules/server/ogAdmClient/__init__.py

@@ -95,7 +95,7 @@ class ogAdmClientWorker (ogLiveWorker):
         Sends OGAgent stopping notification to OpenGnsys server
         """
         logger.debug ('onDeactivation')
-        self.REST.sendMessage ('ogagent/stopped', {'mac': self.mac, 'ip': self.IPlocal, 'idcentro': self.idcentro, 'idaula': self.idaula,
+        self.REST.sendMessage ('ogAdmClient/stopped', {'mac': self.mac, 'ip': self.IPlocal, 'idcentro': self.idcentro, 'idaula': self.idaula,
                                                        'idordenador': self.idordenador, 'nombreordenador': self.nombreordenador})
 
 

src/opengnsys/workers/oglive_worker.py

@@ -449,16 +449,13 @@ class ogLiveWorker(ServerWorker):
             self.urlMenu       = self.service.config.get (self.name, 'urlMenu')
             self.urlMsg        = self.service.config.get (self.name, 'urlMsg')
 
-            ca_file      = self.service.config.get (self.name, 'ca')
-            crt_file     = self.service.config.get (self.name, 'crt')
-            key_file     = self.service.config.get (self.name, 'key')
             url          = url.format          (ogcore_scheme,  ogcore_ip_port)
             self.urlMenu = self.urlMenu.format (urlmenu_scheme, urlmenu_ip_port)
         except NoOptionError as e:
             logger.error ("Configuration error: {}".format (e))
             raise e
         logger.setLevel (loglevel)
-        self.REST = REST (url, ca_file=ca_file, crt_file=crt_file, key_file=key_file)
+        self.REST = REST (url)
 
         if not self.tomaIPlocal():
             raise Exception ('Se han generado errores. No se puede continuar la ejecución de este módulo')