ソースを参照

[Docker API] Fix sieve list for users, fixes #1849

André 7 年 前
コミット
9f52cd9456
2 ファイル変更3 行追加3 行削除
  1. 2 2
      data/Dockerfiles/dockerapi/server.py
  2. 1 1
      docker-compose.yml

+ 2 - 2
data/Dockerfiles/dockerapi/server.py

@@ -86,14 +86,14 @@ class container_post(Resource):
         elif request.json['cmd'] == 'sieve_list' and request.json['username']:
         elif request.json['cmd'] == 'sieve_list' and request.json['username']:
           try:
           try:
             for container in docker_client.containers.list(filters={"id": container_id}):
             for container in docker_client.containers.list(filters={"id": container_id}):
-              sieve_return = container.exec_run(["/bin/bash", "-c", "/usr/local/bin/doveadm sieve list -u '" + request.json['username'].replace("'", "'\\''") + "'"], user='vmail')
+              sieve_return = container.exec_run(["/bin/bash", "-c", "/usr/local/bin/doveadm sieve list -u '" + request.json['username'].replace("'", "'\\''") + "'"])
               return sieve_return.output
               return sieve_return.output
           except Exception as e:
           except Exception as e:
             return jsonify(type='danger', msg=str(e))
             return jsonify(type='danger', msg=str(e))
         elif request.json['cmd'] == 'sieve_print' and request.json['script_name'] and request.json['username']:
         elif request.json['cmd'] == 'sieve_print' and request.json['script_name'] and request.json['username']:
           try:
           try:
             for container in docker_client.containers.list(filters={"id": container_id}):
             for container in docker_client.containers.list(filters={"id": container_id}):
-              sieve_return = container.exec_run(["/bin/bash", "-c", "/usr/local/bin/doveadm sieve get -u '" + request.json['username'].replace("'", "'\\''") + "' '" + request.json['script_name'].replace("'", "'\\''") + "'"], user='vmail')
+              sieve_return = container.exec_run(["/bin/bash", "-c", "/usr/local/bin/doveadm sieve get -u '" + request.json['username'].replace("'", "'\\''") + "' '" + request.json['script_name'].replace("'", "'\\''") + "'"])
               return sieve_return.output
               return sieve_return.output
           except Exception as e:
           except Exception as e:
             return jsonify(type='danger', msg=str(e))
             return jsonify(type='danger', msg=str(e))

+ 1 - 1
docker-compose.yml

@@ -364,7 +364,7 @@ services:
             - watchdog
             - watchdog
 
 
     dockerapi-mailcow:
     dockerapi-mailcow:
-      image: mailcow/dockerapi:1.18
+      image: mailcow/dockerapi:1.19
       restart: always
       restart: always
       build: ./data/Dockerfiles/dockerapi
       build: ./data/Dockerfiles/dockerapi
       oom_kill_disable: true
       oom_kill_disable: true