diff --git a/config.yml b/config.yml index df87455..d2ca46f 100644 --- a/config.yml +++ b/config.yml @@ -8,4 +8,5 @@ crp_config: controller: ports: ["4444/controller"] solvable: + capabilities: ["SETUID", "SETGID", "CHOWN", "AUDIT_WRITE", "DAC_OVERRIDE"] ports: ["8888/http"] diff --git a/solvable/Dockerfile b/solvable/Dockerfile index bfbb869..f2f8e3b 100644 --- a/solvable/Dockerfile +++ b/solvable/Dockerfile @@ -14,6 +14,4 @@ RUN chown -R ${AVATAO_USER} ${TFW_WEBIDE_WD} &&\ chmod -R 755 ${TFW_WEBIDE_WD} VOLUME ["/home/${AVATAO_USER}"] -USER ${AVATAO_USER} WORKDIR /home/${AVATAO_USER} - diff --git a/solvable/src/event_handler_main.py b/solvable/src/event_handler_main.py index e342534..cb95bbf 100644 --- a/solvable/src/event_handler_main.py +++ b/solvable/src/event_handler_main.py @@ -43,7 +43,7 @@ toggle_next.button_state = False if __name__ == '__main__': # pylint: disable=invalid-name - ide = SourceCodeEventHandler(key='webide', directory=TFWENV.WEBIDE_WD, exclude=['*.pyc']) + ide = SourceCodeEventHandler(key='webide', allowed_directories=[TFWENV.WEBIDE_WD], directory=TFWENV.WEBIDE_WD, exclude=['*.pyc']) terminado = TerminadoEventHandler(key='shell', monitor=BashMonitor(TFWENV.HISTFILE)) terminado.historymonitor.subscribe_callback(cenator) terminado.historymonitor.subscribe_callback(selectdir) diff --git a/solvable/src/app.py b/solvable/src/tfw_server.py similarity index 100% rename from solvable/src/app.py rename to solvable/src/tfw_server.py diff --git a/solvable/supervisor/components/event_handlers.conf b/solvable/supervisor/components/event_handlers.conf index 0a95566..93fd749 100644 --- a/solvable/supervisor/components/event_handlers.conf +++ b/solvable/supervisor/components/event_handlers.conf @@ -1,3 +1,4 @@ [program:event_handler_main] +user=root directory=%(ENV_TFW_APP_DIR)s command=python3 event_handler_main.py diff --git a/solvable/supervisor/components/tfw_server.conf b/solvable/supervisor/components/tfw_server.conf new file mode 100644 index 0000000..b14d002 --- /dev/null +++ b/solvable/supervisor/components/tfw_server.conf @@ -0,0 +1,4 @@ +[program:tfwserver] +user=root +directory=%(ENV_TFW_APP_DIR)s +command=python3 tfw_server.py \ No newline at end of file