From f6d2c106756ccc20fda8dcdcb112f93ab81727d9 Mon Sep 17 00:00:00 2001 From: ZCTMDC Date: Thu, 9 Jun 2022 12:40:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20htpasswd=20=E5=9C=A8?= =?UTF-8?q?=E4=BD=8Elinux=E5=86=85=E6=A0=B8=E7=89=88=E6=9C=AC=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix bug 使用加密 ``` root@50b303640d95:/# htpasswd -nb uu pp > htpasswd: Unable to generate random bytes: Function not implemented ``` 尝试不使用加密 use -p > -p Do not encrypt the password (plaintext, insecure). ``` root@50b303640d95:/# htpasswd -npb uu pp > Warning: storing passwords as plain text might just not work on this platform. uu:pp ``` 测试正常 --- src/cmd/addauth.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/cmd/addauth.sh b/src/cmd/addauth.sh index 3e1e905..6079cf2 100644 --- a/src/cmd/addauth.sh +++ b/src/cmd/addauth.sh @@ -13,9 +13,11 @@ usage(){ load(){ if [ ! -f $FPASS ]; then - htpasswd -bc $FPASS $1 $2 - else - htpasswd -b $FPASS $1 $2 + touch $FPASS + fi + htpasswd -b $FPASS $1 $2 + if [ "$?" != 0 ] ; then + htpasswd -bp $FPASS $1 $2 fi } From 8d14ec90715a29c5f21009884c0e4f72b1ee2403 Mon Sep 17 00:00:00 2001 From: ZCTMDC Date: Thu, 9 Jun 2022 14:16:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20htpasswd=20=E6=98=8E?= =?UTF-8?q?=E6=96=87=E5=AF=86=E7=A0=81=E4=B8=8D=E5=8F=AF=E7=94=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复 htpasswd 明文密码不可用bug: - `ningx` 在 `Linux` 中使用 `htpasswd`` 明文密码不可用 - 使用 `openssl passwd -apr1` 创建密码 --- src/cmd/addauth.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cmd/addauth.sh b/src/cmd/addauth.sh index 6079cf2..b5381f0 100644 --- a/src/cmd/addauth.sh +++ b/src/cmd/addauth.sh @@ -17,7 +17,8 @@ load(){ fi htpasswd -b $FPASS $1 $2 if [ "$?" != 0 ] ; then - htpasswd -bp $FPASS $1 $2 + htpasswd -D $FPASS $1 + printf "$1:$(openssl passwd -apr1 $2)\n" >> $FPASS fi } From 6c31b12cef91870b25c0cd33d6c7ebef18ad25fc Mon Sep 17 00:00:00 2001 From: ZCTMDC Date: Sun, 19 Jun 2022 15:16:55 +0800 Subject: [PATCH 3/4] UPDATE DOCKERFILE --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index a7c57f1..2c3e349 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,7 @@ RUN cp /usr/share/gitweb/static/gitweb.css /usr/share/gitweb/static/gitweb.css.o RUN mkdir /usr/share/gitweb/ihm VOLUME /var/lib/git +WORKDIR /var/lib/git EXPOSE 80 ENTRYPOINT ["/entrypoint.sh"] From 43fcd3e6776c5ac23d431b2b4cfd1d62970422e5 Mon Sep 17 00:00:00 2001 From: ZCTMDC Date: Sun, 19 Jun 2022 15:19:37 +0800 Subject: [PATCH 4/4] add description --- src/cmd/addrepos.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cmd/addrepos.sh b/src/cmd/addrepos.sh index ca318d4..976bec8 100644 --- a/src/cmd/addrepos.sh +++ b/src/cmd/addrepos.sh @@ -17,6 +17,7 @@ load(){ mkdir $REPOS cd $REPOS git init --bare + echo "$1" > description chmod -R 777 $REPOS fi }