From 8760d36ad163de48aa2b7e502f3d94386d48e71d Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 24 Apr 2021 11:13:48 +0200
Subject: [PATCH] Update and rename 92-smb_mounts_v1.1 to 92-smb_mounts_v1.2

---
 .../rootfs/etc/cont-init.d/92-smb_mounts_v1.1 | 33 ---------
 .../rootfs/etc/cont-init.d/92-smb_mounts_v1.2 | 71 +++++++++++++++++++
 2 files changed, 71 insertions(+), 33 deletions(-)
 delete mode 100644 papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.1
 create mode 100644 papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.2

diff --git a/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.1 b/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.1
deleted file mode 100644
index 30c677477..000000000
--- a/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.1
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/with-contenv bashio
-
-####################
-# MOUNT SMB SHARES #
-####################
-if bashio::config.has_value 'networkdisks'; then
-    # Mount CIFS Share if configured and if Protection Mode is active
-    bashio::log.info 'Mounting smb share(s)...'
-
-    # Define variables 
-    MOREDISKS=$(bashio::config 'networkdisks')
-    CIFS_USERNAME=$(bashio::config 'cifsusername')
-    CIFS_PASSWORD=$(bashio::config 'cifspassword')
-
-    # Allow SMB1
-    if bashio::config.true 'smbv1'; then
-      SMBVERS=",vers=1.0"
-    else
-      SMBVERS=",vers=2.1"
-    fi
-
-    # Mounting disks
-    for disk in ${MOREDISKS//,/ }  # Separate comma separated values
-    do
-      disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
-      diskname=${disk//\\//} #replace \ with /
-      diskname=${diskname##*/} # Get only last part of the name
-      mkdir -p /mnt/$diskname  # Create dir
-      chown -R root:root /mnt/$diskname  # Permissions
-      mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD$SMBVERS $disk /mnt/$diskname && \
-      bashio::log.info "... $disk successfully mounted to /mnt/$diskname" || bashio::log.error "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD" # Mount share
-    done || true
-fi
diff --git a/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.2 b/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.2
new file mode 100644
index 000000000..3551a73b8
--- /dev/null
+++ b/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.2
@@ -0,0 +1,71 @@
+#!/usr/bin/with-contenv bashio
+
+####################
+# MOUNT SMB SHARES #
+####################
+if bashio::config.has_value 'networkdisks'; then
+    # Mount CIFS Share if configured and if Protection Mode is active
+    bashio::log.info 'Mounting smb share(s)...'
+
+    # Define variables 
+    MOREDISKS=$(bashio::config 'networkdisks')
+    CIFS_USERNAME=$(bashio::config 'cifsusername')
+    CIFS_PASSWORD=$(bashio::config 'cifspassword')
+
+    # Mounting disks
+    for disk in ${MOREDISKS//,/ }  # Separate comma separated values
+    do
+      disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+      diskname=${disk//\\//} #replace \ with /
+      diskname=${diskname##*/} # Get only last part of the name
+      mkdir -p /mnt/$diskname  # Create dir
+      chown -R root:root /mnt/$diskname  # Permissions
+      mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /mnt/$diskname && \
+      bashio::log.info "... $disk successfully mounted to /mnt/$diskname"
+
+      # if Fail test smbv1
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,vers=1.0 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$diskname with smbv1"
+      fi
+
+      # Test smbv2.1
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,vers=2.1 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$disk name with smbv2.1"
+      fi
+
+      # Test smbv3
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,vers=3.0 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$disk name with smbv3"
+      fi
+
+      # Test ntlmv2
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,sec=ntlmv2 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$disk name with ntlmv2"
+      fi
+
+      # Test ntlmv2 and smbv3
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,sec=ntlmv2,vers=2.1 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$disk name with ntlmv2 and smbv2.1"
+      fi
+
+      # Test ntlmv2 and smbv3
+      if [ $? != 0 ]; then
+        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD,sec=ntlmv2,vers=3 $disk /mnt/$diskname && \
+        bashio::log.info "... $disk successfully mounted to /mnt/$disk name with ntlmv2 and smbv3"
+      fi
+
+      if [ $? != 0 ]; then
+        # message if still fail
+        bashio::log.critical "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD . Please check your remote share path, the username and password, and try to check the smbv1 box in option if your share is using smb v1" # Mount share
+      else
+        # test write permissions
+        touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze || bashio::log.critical "Unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw" 
+      fi
+
+    done
+fi