Merge branch 'v3' of github.com:jumpserver/jumpserver into v3

Dockerfile

@@ -45,8 +45,10 @@ ARG TOOLS="                           \
         unzip                         \
         wget"
 
+ARG APT_MIRROR=http://mirrors.ustc.edu.cn
+
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \
-    sed -i 's@http://.*.debian.org@http://mirrors.ustc.edu.cn@g' /etc/apt/sources.list \
+    sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \
     && rm -f /etc/apt/apt.conf.d/docker-clean \
     && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && apt-get update \
@@ -61,18 +63,15 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \
     && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \
     && rm -rf /var/lib/apt/lists/*
 
-ARG ORACLE_LIB_MAJOR=19
-ARG ORACLE_LIB_MINOR=10
-ENV ORACLE_FILE="instantclient-basiclite-linux.${TARGETARCH:-amd64}-${ORACLE_LIB_MAJOR}.${ORACLE_LIB_MINOR}.0.0.0dbru.zip"
+ARG DOWNLOAD_URL=https://download.jumpserver.org
 
 RUN mkdir -p /opt/oracle/ \
     && cd /opt/oracle/ \
-    && wget https://download.jumpserver.org/files/oracle/${ORACLE_FILE} \
-    && unzip instantclient-basiclite-linux.${TARGETARCH-amd64}-19.10.0.0.0dbru.zip \
-    && mv instantclient_${ORACLE_LIB_MAJOR}_${ORACLE_LIB_MINOR} instantclient \
-    && echo "/opt/oracle/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf \
+    && wget ${DOWNLOAD_URL}/public/instantclient-basiclite-linux.${TARGETARCH}-19.10.0.0.0.zip \
+    && unzip instantclient-basiclite-linux.${TARGETARCH}-19.10.0.0.0.zip \
+    && sh -c "echo /opt/oracle/instantclient_19_10 > /etc/ld.so.conf.d/oracle-instantclient.conf" \
     && ldconfig \
-    && rm -f ${ORACLE_FILE}
+    && rm -f instantclient-basiclite-linux.${TARGETARCH}-19.10.0.0.0.zip
 
 WORKDIR /tmp/build
 COPY ./requirements ./requirements

apps/perms/const.py

@@ -10,11 +10,11 @@ __all__ = ["ActionChoices"]
 
 
 class ActionChoices(BitChoices):
-    connect = bit(1), _("Connect")
-    upload = bit(2), _("Upload")
-    download = bit(3), _("Download")
-    copy = bit(4), _("Copy")
-    paste = bit(5), _("Paste")
+    connect = bit(0), _("Connect")
+    upload = bit(1), _("Upload")
+    download = bit(2), _("Download")
+    copy = bit(3), _("Copy")
+    paste = bit(4), _("Paste")
 
     @classmethod
     def is_tree(cls):
@@ -23,6 +23,7 @@ class ActionChoices(BitChoices):
     @classmethod
     def branches(cls):
         return (
+            cls.connect,
             (_("Transfer"), [cls.upload, cls.download]),
             (_("Clipboard"), [cls.copy, cls.paste]),
         )