update changelog

- stop webserver on shutdown
- enable asyncio debug mode for debug versions

app/Dockerfile

@@ -45,7 +45,7 @@ ENV HOME=/home/$SERVICE_NAME
 # set the working directory in the container
 WORKDIR /home/$SERVICE_NAME
 
-VOLUME ["/home/$SERVICE_NAME/log", "/home/$SERVICE_NAME/config", "/home/$SERVICE_NAME/cert"]
+VOLUME ["/home/$SERVICE_NAME/log", "/home/$SERVICE_NAME/config"]
 
 # install the requirements from the wheels packages from the builder stage 
 # and unistall python packages and alpine package manger to reduce attack surface
@@ -64,7 +64,7 @@ COPY --chmod=0700 entrypoint.sh /root/entrypoint.sh
 COPY config .
 COPY src .
 RUN date > /build-date.txt
-EXPOSE 5005 8127 10000 10443
+EXPOSE 5005 8127 10000
 
 # command to run on container start
 ENTRYPOINT ["/root/entrypoint.sh"]

app/src/server.py

@@ -1,6 +1,5 @@
 import logging
 import asyncio
-import ssl
 import signal
 import os
 from asyncio import StreamReader, StreamWriter
@@ -84,17 +83,12 @@ async def handle_client_v2(reader: StreamReader, writer: StreamWriter):
     await InverterG3P(reader, writer, addr).server_loop(addr)
 
 
-async def handle_client_v3(reader: StreamReader, writer: StreamWriter):
-    '''Handles a new incoming connection and starts an async loop'''
-    logging.info('Accept on port 10443')
-    addr = writer.get_extra_info('peername')
-    await InverterG3P(reader, writer, addr).server_loop(addr)
-
-
-async def handle_shutdown(loop, runner):
+async def handle_shutdown(web_task):
     '''Close all TCP connections and stop the event loop'''
 
     logging.info('Shutdown due to SIGTERM')
+    global proxy_is_up
+    proxy_is_up = False
 
     #
     # first, disc all open TCP connections gracefully
@@ -122,7 +116,7 @@ async def handle_shutdown(loop, runner):
     await web_task
 
     #
-    # at last, we stop the loop
+    # at last, start a coro for stopping the loop
     #
     logging.debug("Stop event loop")
     loop.stop()
@@ -178,40 +172,6 @@ if __name__ == "__main__":
     #
     loop.create_task(asyncio.start_server(handle_client, '0.0.0.0', 5005))
     loop.create_task(asyncio.start_server(handle_client_v2, '0.0.0.0', 10000))
-
-    # https://crypto.stackexchange.com/questions/26591/tls-encryption-with-a-self-signed-pki-and-python-s-asyncio-module
-    '''
-    openssl genrsa -out -des3 ca.key.pem 2048
-    openssl genrsa -out server.key.pem 2048
-    openssl genrsa -out client.key.pem 2048
-
-    openssl req -x509 -new -nodes -key ca.key.pem -sha256 -days 365
-      -out ca.cert.pem -subj /C=US/ST=CA/L=Somewhere/O=Someone/CN=FoobarCA
-
-    openssl req -new -sha256 -key server.key.pem
-     -subj /C=US/ST=CA/L=Somewhere/O=Someone/CN=Foobar -out server.csr
-    openssl x509 -req -in server.csr -CA ca.cert.pem -CAkey ca.key.pem
-      -CAcreateserial -out server.cert.pem -days 365 -sha256
-
-    openssl req -new -sha256 -key client.key.pem
-      -subj /C=US/ST=CA/L=Somewhere/O=Someone/CN=Foobar -out client.csr
-    openssl x509 -req -in client.csr -CA ca.cert.pem -CAkey ca.key.pem
-      -CAcreateserial -out client.cert.pem -days 365 -sha256
-    '''
-
-    server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-    server_ctx.minimum_version = ssl.TLSVersion.TLSv1_2
-    server_ctx.maximum_version = ssl.TLSVersion.TLSv1_3
-    server_ctx.verify_mode = ssl.CERT_REQUIRED
-    server_ctx.options |= ssl.OP_SINGLE_ECDH_USE
-    server_ctx.options |= ssl.OP_NO_COMPRESSION
-    server_ctx.load_cert_chain(certfile='cert/server.pem',
-                               keyfile='cert/server.key')
-    server_ctx.load_verify_locations(cafile='cert/ca.pem')
-    server_ctx.set_ciphers('ECDH+AESGCM')
-
-    loop.create_task(asyncio.start_server(handle_client_v3, '0.0.0.0', 10443,
-                                          ssl=server_ctx))
     web_task = loop.create_task(webserver('0.0.0.0', 8127))
 
     #
@@ -223,7 +183,7 @@ if __name__ == "__main__":
                                 lambda loop=loop: asyncio.create_task(
                                     handle_shutdown(web_task)))
 
-    loop.set_debug(True)
+    loop.set_debug(log_level == logging.DEBUG)
     try:
         if ConfigErr is None:
             proxy_is_up = True