Allow home uploads

diff --git a/hotline/file_path.go b/hotline/file_path.go
index f4a27cc587b9c89f876ba7593adac1323573c350..bb6bbd312b62864591b893774930d23da5b19227 100644 (file)
--- a/hotline/file_path.go
+++ b/hotline/file_path.go
@@ -98,6 +98,15 @@ func (fp *FilePath) IsUploadDir() bool {
        return strings.Contains(strings.ToLower(string(fp.Items[fp.Len()-1].Name)), "upload")
 }
 
        return strings.Contains(strings.ToLower(string(fp.Items[fp.Len()-1].Name)), "upload")
 }
 

+func (fp *FilePath) IsUserDir() bool {
+    if fp.Len() == 0 {
+        return false
+    }
+
+    return strings.HasPrefix(string(fp.Items[0].Name), "~")
+}
+
+

 func (fp *FilePath) Len() uint16 {
        return binary.BigEndian.Uint16(fp.ItemCount[:])
 }
 func (fp *FilePath) Len() uint16 {
        return binary.BigEndian.Uint16(fp.ItemCount[:])
 }

diff --git a/internal/mobius/transaction_handlers.go b/internal/mobius/transaction_handlers.go
index 0cba65afc204d82d8c9529a6d26325d0211f2c42..e74056f8dc4da49eda764c33b1ff9356692b005e 100644 (file)
--- a/internal/mobius/transaction_handlers.go
+++ b/internal/mobius/transaction_handlers.go
@@ -1385,7 +1385,7 @@ func HandleUploadFolder(cc *hotline.ClientConn, t *hotline.Transaction) (res []h
 
        // Handle special cases for Upload and Drop Box folders
        if !cc.Authorize(hotline.AccessUploadAnywhere) {
 
        // Handle special cases for Upload and Drop Box folders
        if !cc.Authorize(hotline.AccessUploadAnywhere) {

-               if !fp.IsUploadDir() && !fp.IsDropbox() {
+               if !fp.IsUploadDir() && !fp.IsDropbox() && !fp.IsUserDir() {

                        return cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the folder \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(t.GetField(hotline.FieldFileName).Data)))
                }
        }
                        return cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the folder \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(t.GetField(hotline.FieldFileName).Data)))
                }
        }


@@ -1428,7 +1428,7 @@ func HandleUploadFile(cc *hotline.ClientConn, t *hotline.Transaction) (res []hot
 
        // Handle special cases for Upload and Drop Box folders
        if !cc.Authorize(hotline.AccessUploadAnywhere) {
 
        // Handle special cases for Upload and Drop Box folders
        if !cc.Authorize(hotline.AccessUploadAnywhere) {

-               if !fp.IsUploadDir() && !fp.IsDropbox() {
+               if !fp.IsUploadDir() && !fp.IsDropbox() && !fp.IsUserDir() {

                        return cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the file \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(fileName)))
                }
        }
                        return cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the file \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(fileName)))
                }
        }