Upload / download file fixes

Author: litnimax

asterisk/Dockerfile

@@ -21,6 +21,6 @@ RUN pip install -r /services/requirements.txt
 
 COPY ./docker-entrypoint.sh /
 
-EXPOSE 5060/udp 8088 5038
+EXPOSE 5060/udp 5038 8088 8010
 
 ENTRYPOINT ["/docker-entrypoint.sh"]

asterisk/docker-entrypoint.sh

@@ -2,7 +2,7 @@
 
 # dockerize templates
 for i in `find /etc -name '*.tmpl'`; do
-  dockerize -template "$i":"${i%%.tmpl}"
+  dockerize -template "$i":"${i%%.tmpl}" && rm "$i"
 done
 
 if [ "$1" = "" ]; then

asterisk/etc/asterisk/http.conf.tmpl

@@ -2,7 +2,7 @@
 
 servername=Asteriska
 enabled={{ default .Env.HTTP_ENABLED "no" }}
-bindaddr={{ default .Env.BRIDGE_IP "127.0.0.1" }}
+bindaddr={{ default .Env.HTTP_LISTEN_ADDRESS "127.0.0.1" }}
 bindport={{ default .Env.HTTP_PORT "8088" }}
 enablestatic=yes
 

asterisk/etc/asterisk/manager.conf.tmpl

@@ -2,7 +2,7 @@
 enabled = {{ default .Env.MANAGER_ENABLED "no" }}
 webenabled = {{ default .Env.MANAGER_WEB_ENABLED "no" }}
 port = 5038
-bindaddr = {{ default .Env.BRIDGE_IP "127.0.0.1" }}
+bindaddr = {{ default .Env.MANAGER_LISTEN_ADDRESS "127.0.0.1" }}
 
 [{{ default .Env.MANAGER_LOGIN "manager" }}]
 secret={{ default .Env.MANAGER_PASSWORD "secret" }}

asterisk/etc/asterisk/res_odbc.conf.tmpl

@@ -1,10 +1,6 @@
-[ENV]
-
 [odoo]
-connection=odoo
-loguniqueid=yes
-table=asterisk_cdr
-alias start => started
-alias answer => answered
-alias end => ended
-usegmtime=yes
+enabled => yes
+dsn => PostgreSQL-odoo
+username => {{ default .Env.DB_USER "odoo" }}
+password => {{ default .Env.DB_PASSWORD "odoo" }}
+pre-connect => yes

asterisk/etc/supervisord.conf

@@ -34,7 +34,7 @@ directory=/services
 command=python ami_broker.py
 redirect_stderr=true
 
-#[program:stasis_apps]
-#directory=/services
-#command=python stasis_apps.py
-#redirect_stderr=true
+[program:stasis_apps]
+directory=/services
+command=python stasis_apps.py
+redirect_stderr=true

asterisk/services/ami_broker.py

@@ -32,7 +32,7 @@ def __init__(self):
         setproctitle.setproctitle('ami_broker')
         self.ami_disconnected.set()
         self.settings['AsteriskHost']  = os.environ.get(
-            'MANAGER_IP', '127.0.0.1')
+            'MANAGER_LISTEN_ADDRESS', '127.0.0.1')
         self.settings['AmiPort']  = os.environ.get(
             'MANAGER_PORT', '5038')
         self.settings['AsteriskLogin']  = os.environ.get(
@@ -41,6 +41,8 @@ def __init__(self):
             'MANAGER_PASSWORD', 'odoo')
         self.settings['AmiHeartbeatInterval']  = os.environ.get(
             'MANAGER_HEARTBEAT_INTERVAL', '10')
+        self.settings['AmiReconnectTimeout']  = int(os.environ.get(
+            'MANAGER_RECONNECT_TIMEOUT', '5'))
         self.spawn(self.ami_connection_loop)
         self.spawn(self.ami_heartbeat)
 

asterisk/services/asterisk_helper.py

@@ -9,37 +9,23 @@
 logging.basicConfig(level=logging.DEBUG)
 _logger = logging.getLogger(__name__)
 
-ASTERISK = '/usr/bin/asterisk'
+ASTERISK = os.environ.get('ASTERISK_BINARY', '/usr/sbin/asterisk')
+ASTERISK_ARGS = '-cr'
+SSL_ENABLED = False
+LISTEN_ADDRESS = os.environ.get('CONSOLE_LISTEN_ADDRESS', '0.0.0.0')
+LISTEN_PORT = int(os.environ.get('CONSOLE_LISTEN_PORT', '8010'))
 
-from conf import *
 
 class MyTermSocket(TermSocket):
 
     def check_origin(self, origin):
         return True
 
 
-class RecordingDeleteHandler(tornado.web.RequestHandler):
-    def get(self):
-        # Take only the right part of the path to get rid if ../../etc/password
-        base_name = os.path.basename(self.get_argument('filename'))
-        # Now format a clean path
-        file_path = os.path.join(ASTERISK_RECORDING_FOLDER,
-            base_name)
-        if os.path.exists(file_path):
-            _logger.info('Deleteing {}.'.format(file_path))
-            os.unlink(file_path)
-            self.write('DELETED')
-        else:
-            _logger.warning('File {} does not exist.'.format(file_path))
-            self.write('NOT_FOUND')
-
-
 if __name__ == '__main__':
     term_manager = SingleTermManager(shell_command=[ASTERISK, ASTERISK_ARGS])
     handlers = [
                 (r'/websocket', MyTermSocket, {'term_manager': term_manager}),
-                (r'/delete_recording', RecordingDeleteHandler)
                ]
 
 # Create SSL context
@@ -52,5 +38,5 @@ def get(self):
 # Start server
 app = tornado.web.Application(handlers)
 server = HTTPServer(app, ssl_options=ssl_ctx)
-server.listen(PORT)
+server.listen(LISTEN_PORT, address=LISTEN_ADDRESS)
 IOLoop.current().start()

asterisk/services/conf.py

@@ -16,7 +16,7 @@
 
 # Define Variables
 AST_ETC_DIR= "/etc/asterisk"
-AST_BINARY = "/usr/sbin/asterisk"
+ASTERISK_BINARY = os.environ.get('ASTERISK_BINARY', '/usr/sbin/asterisk')
 MQTT_HOST = "broker"
 MQTT_PORT = 1883
 MQTT_KEEPALIVE_INTERVAL = 45
@@ -123,13 +123,13 @@ def asterisk_commands_worker(self):
                 # Empty the queue
                 self.asterisk_commands_queue = []
                 logging.debug('Calling asterisk reload.')
-                subprocess.check_call([AST_BINARY, '-rx', 'reload'])
+                subprocess.check_call([ASTERISK_BINARY, '-rx', 'reload'])
             else:
                 while len(self.asterisk_commands_queue):
                     # Pop commands and apply one by one
                     cmd = self.asterisk_commands_queue.pop()
                     logging.debug('Calling asterisk {}.'.format(cmd))
-                    subprocess.check_call([AST_BINARY, '-rx', cmd])
+                    subprocess.check_call([ASTERISK_BINARY, '-rx', cmd])
                 # CLear the flag
             self.asterisk_commands_flag.clear()