Commit 92660cda authored by Mudassar Khan's avatar Mudassar Khan
Browse files

fix(webui): fix configuration blocking ACME Web UI access

parent 541a56da

go-apps/meep-iot-pltf/meep-acme-in-cse/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ RUN echo "meep-acme-in-cse" > /etc/hostname \ 


WORKDIR /usr/src/app



RUN git clone --branch master https://github.com/ankraft/ACME-oneM2M-CSE.git ACME-oneM2M-CSE

RUN git clone --branch development https://github.com/ankraft/ACME-oneM2M-CSE.git ACME-oneM2M-CSE



WORKDIR /usr/src/app/ACME-oneM2M-CSE

go-apps/meep-iot-pltf/meep-acme-in-cse/acme.ini.in

+6 −2
Original line number Diff line number Diff line
@@ -61,8 +61,12 @@ enable=true 
[http]

enableUpperTesterEndpoint=true

enableStructureEndpoint=true

;root=/$SVC_PATH/

address=https://${basic.config:cseHost}:${basic.config:httpPort}${http:root}

root=/

address=https://${basic.config:cseHost}:${basic.config:httpPort}${http:externalRoot}

externalRoot=/$SVC_PATH/



[webui]

root=/webui



[coap]

enable=$ENABLE_COAP

go-apps/meep-iot-pltf/meep-acme-mn-cse/acme.ini.in

+5 −3
Original line number Diff line number Diff line
@@ -56,10 +56,12 @@ enable=true 
[http]

enableUpperTesterEndpoint = true

enableStructureEndpoint = true

address=https://${basic.config:cseHost}:${basic.config:httpPort}${http:root}

root=/

address=https://${basic.config:cseHost}:${basic.config:httpPort}${http:externalRoot}

externalRoot=/$SVC_PATH/



[webui]

;root=/$SVC_PATH/webui

root=/webui



[mqtt]

enable=$MQTT_ENABLE
@@ -84,7 +86,7 @@ enable=false 
port=8180



[logging]

enableBindingsLogging = true

enableBindingsLogging = false



[etsi_mec]

mec_enable=$MEC_ENABLE

go-apps/meep-iot-pltf/meep-acme-mn-cse/acme/protocols/MECClient.py

+3 −2
Original line number Diff line number Diff line
@@ -253,8 +253,9 @@ class MECClient(object): 
			body_json['userTransportInfo'] = userTransportInfoList

			customServicesTransportInfoList = []

			customServicesTransportInfo = {}

			customServicesTransportInfo['id'] = str(uuid.uuid4())

			customServicesTransportInfo['name'] = Configuration.cse_cseID

			# customServicesTransportInfo['id'] = str(uuid.uuid4())

			customServicesTransportInfo['id'] = Configuration.cse_cseID

			customServicesTransportInfo['name'] = Configuration.cse_resourceName

			customServicesTransportInfo['description'] = 'ACME oneM2M CSE ID'

			customServicesTransportInfo['type'] = 'REST_HTTP'

			customServicesTransportInfo['protocol'] = 'REST_HTTP'

go-apps/meep-iot-pltf/meep-acme-mn-cse/acme/runtime/CSE.py

+20 −5
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ from ..services.GroupManager import GroupManager 
from ..runtime.Importer import Importer

from ..services.LocationManager import LocationManager

from ..services.NotificationManager import NotificationManager

from ..runtime.PluginManager import PluginManager

from ..services.RegistrationManager import RegistrationManager

from ..services.RemoteCSEManager import RemoteCSEManager

from ..runtime.ScriptManager import ScriptManager
@@ -97,6 +98,9 @@ mqttClient:MQTTClient = None 
notification:NotificationManager = None

"""	Runtime instance of the `NotificationManager`. """



pluginManager:PluginManager = None

"""	Runtime instance of the `PluginManager`. """



registration:RegistrationManager = None

"""	Runtime instance of the `RegistrationManager`. """
@@ -159,7 +163,7 @@ def startup(args:argparse.Namespace, **kwargs:Dict[str, Any]) -> bool: 
			False if the CSE couldn't initialized and started. 

	"""

	global action, announce, coapServer, console, dispatcher, event, groupResource, httpServer, importer, location, mqttClient, mecClient

	global notification, registration, remote, request, script, security, semantic, statistics, storage, textUI, time

	global notification, pluginManager, registration, remote, request, script, security, semantic, statistics, storage, textUI, time

	global timeSeries, validator, webSocketServer



	# Set status
@@ -254,6 +258,11 @@ def startup(args:argparse.Namespace, **kwargs:Dict[str, Any]) -> bool: 
			RC.cseStatus = CSEStatus.STOPPED

			return False

		

		# Initialize the plugin manager

		# This loads, configures and runs the plugins as well

		pluginManager = PluginManager()



		

		# Start the HTTP server

		if not httpServer.run(): 						# This does return (!)

			L.logErr('Terminating', showStackTrace = False)
@@ -282,6 +291,11 @@ def startup(args:argparse.Namespace, **kwargs:Dict[str, Any]) -> bool: 
		L.logErr(f'Error during startup: {e.dbg}')

		RC.cseStatus = CSEStatus.STOPPED

		return False

	except KeyError as e:

		L.logErr(f'Error during startup: {e}')

		RC.cseStatus = CSEStatus.STOPPED

		return False



	except Exception as e:

		L.logErr(f'Error during startup: {e}', exc=e)

		RC.cseStatus = CSEStatus.STOPPED
@@ -309,7 +323,7 @@ def startup(args:argparse.Namespace, **kwargs:Dict[str, Any]) -> bool: 




def shutdown() -> None:

	"""	Gracefully shutdown the CSE programmatically. This will end the mail console loop

	"""	Gracefully shutdown the CSE programmatically. This will end the main console loop

		to terminate.



		The actual shutdown happens in the _shutdown() method.
@@ -349,6 +363,7 @@ def _shutdown() -> None: 
		event.cseShutdown() 	# type: ignore

	

	# shutdown the services

	pluginManager and pluginManager.shutdown()

	textUI and textUI.shutdown()

	console and console.shutdown()

	time and time.shutdown()
@@ -451,7 +466,7 @@ def resetCSE() -> None: 
		# Enable log queuing again

		L.queueOn()



		# Send restart event

		# Send restarted event

		event.cseRestarted()	# type: ignore [attr-defined]   



		RC.cseStatus = CSEStatus.RUNNING