Fix for RAL Bug + Device.id not recognized

Author: Stefan Witschel

c8ydm/agentmodules/remote_access_listener.py

@@ -52,8 +52,8 @@ def handleOperation(self, message):
             Exception: Error when handling the operation
        """
         try:
-            #self.logger.debug(
-            #    f'Handling Cloud Remote Access operation: listener={__name__}, message={message}')
+            self.logger.debug(
+                f'Handling Cloud Remote Access operation: listener={__name__}, message={message}')
 
             if message.messageId == self.remote_access_default_template or message.messageId == self.remote_access_op_template:
                 self._set_executing()
@@ -72,14 +72,19 @@ def _proxy_connect(self, message):
         tcp_host = message.values[1]
         tcp_port = int(message.values[2])
         connection_key = message.values[3]
-
         config = self.agent.configuration
-        credentials = config.getCredentials()
-
-        token = self.agent.token
-        tenantuser = credentials[0]+'/'+ credentials[1]
-        password = credentials[2]
-
+        tenantuser = None
+        password = None
+        token = None
+        
+        if self.agent.token:
+            token = self.agent.token
+            self.logger.info(f'RAL Token received: {token}')
+        else:
+            credentials = config.getCredentials()
+            tenantuser = credentials[0]+'/'+ credentials[1]
+            password = credentials[2]
+        
         if token is None and tenantuser is None and password is None:
             raise WebSocketFailureException(
                 'OAuth Token or tenantuser and password must be provided!')

c8ydm/main.py

@@ -107,7 +107,7 @@ def start():
 
         containerId = None
         serial = None
-
+        
         if serial == None:
             logging.debug(f'Serial not proviced. Fetching from system...')
             try:
@@ -134,8 +134,8 @@ def start():
         logging.info(f'Serial: {serial}')
 
         credentials = config.getCredentials()
-        logging.debug('Credentials:')
-        logging.debug(credentials)
+        #logging.debug('Credentials:')
+        #logging.debug(credentials)
         agent = Agent(serial, path, config, str(path) + '/agent.pid', simulated)
         cert_auth = config.getBooleanValue('mqtt','cert_auth')
         logging.debug(f'cert_auth: {cert_auth}')

scripts/start_docker.sh

@@ -6,9 +6,14 @@ CA_NAME="iot-ca"
 CERT_NAME="device-cert"
 
 if [ -n "${C8YDM_MQTT_CERT_AUTH:-}" ] && [ $C8YDM_MQTT_CERT_AUTH = "true" ]; then
-    # use container id as serial
+    # use container id as serial if not manual provided
+    if [[ -z "${C8YDM_AGENT_DEVICE__ID}" ]]; then
+        C8YDM_AGENT_DEVICE__ID=$HOSTNAME
+        export C8YDM_AGENT_DEVICE__ID=$HOSTNAME
+    fi
+    
     ./scripts/generate_cert.sh \
-    --serial $HOSTNAME \
+    --serial $C8YDM_AGENT_DEVICE__ID \
     --root-name $CA_NAME \
     --cert-name $CERT_NAME \
     --cert-dir "/root/.cumulocity/certs"
@@ -20,8 +25,6 @@ if [ -n "${C8YDM_MQTT_CERT_AUTH:-}" ] && [ $C8YDM_MQTT_CERT_AUTH = "true" ]; the
     --password $CERT_PASSWORD \
     --cert-path "/root/.cumulocity/certs/$CA_NAME.pem" \
     --cert-name $CA_NAME
-
-    export C8YDM_AGENT_DEVICE__ID=$HOSTNAME
 fi
 
 if which vncserver; then

setup.py

@@ -27,7 +27,7 @@
       name='c8ydm',
       long_description=long_description,
       long_description_content_type="text/markdown",
-      version='1.2.0',
+      version='1.2.1',
       description='Cumulocity Device Management Agent',
       author='Tobias Sommer, Stefan Witschel, Marco Stoffel, Murat Bayram',
       author_email="Stefan.Witschel@softwareag.com",