update kingpin

add search in an other namespaces

Author: JojiiOfficial

go.sum

@@ -11,8 +11,12 @@ github.com/JojiiOfficial/gaw v1.2.8/go.mod h1:fPm2wG1z8xSCmfkqq9V5iHdlgLUpkRx73t
 github.com/JojiiOfficial/shred v1.2.1 h1:658CFVTqcAkYVg815vW+guYnyJTLOIoS15tMyPTYhNo=
 github.com/JojiiOfficial/shred v1.2.1/go.mod h1:/OAxd6eYOhrXb3KW+2wmDog2BiFlUld8oJEKa+xblxU=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/alecthomas/kingpin v0.0.0-20200323085623-b6657d9477a6 h1:0fwkEPHxb5V+KZZLxWmOknl4oHWo60+TnhmKOi4BIkU=
+github.com/alecthomas/kingpin v0.0.0-20200323085623-b6657d9477a6/go.mod h1:b6br6/pDFSfMkBgC96TbpOji05q5pa+v5rIlS0Y6XtI=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=

handlers/FileHandler.go

@@ -375,7 +375,7 @@ func FileHandler(handlerData web.HandlerData, w http.ResponseWriter, r *http.Req
 	}
 
 	// Find files
-	files, err := models.FindFiles(handlerData.Db, models.File{
+	files, err := models.FindFiles(handlerData.Db, handlerData.Config, models.File{
 		Model: gorm.Model{
 			ID: request.FileID,
 		},

models/Config.go

@@ -41,6 +41,7 @@ type configServer struct {
 	Roles                     roleConfig
 	AllowRegistration         bool          `default:"false"`
 	DeleteUnusedSessionsAfter time.Duration `default:"10m"`
+	SearchInOtherNamespaces   bool
 }
 
 type roleConfig struct {
@@ -125,6 +126,7 @@ func InitConfig(confFile string, createMode bool) (*Config, bool) {
 				},
 				AllowRegistration:         false,
 				DeleteUnusedSessionsAfter: 10 * time.Minute,
+				SearchInOtherNamespaces:   true,
 				Roles: roleConfig{
 					DefaultRole: 1,
 					Roles: []Role{

models/File.go

@@ -123,7 +123,7 @@ func (file File) IsInGroupList(groups []string) bool {
 }
 
 // FindFiles finds file
-func FindFiles(db *gorm.DB, file File) ([]File, error) {
+func FindFiles(db *gorm.DB, config *Config, file File, ignoreNamespace ...bool) ([]File, error) {
 	var files []File
 	a := db.Model(&File{})
 
@@ -139,7 +139,11 @@ func FindFiles(db *gorm.DB, file File) ([]File, error) {
 
 	// Filter by namespace ID and uploader
 	if file.Namespace != nil {
-		a = a.Where("namespace_id = ? AND uploader = ?", file.Namespace.ID, file.Namespace.UserID)
+		a = a.Where("uploader = ?", file.Namespace.UserID)
+
+		if len(ignoreNamespace) == 0 {
+			a = a.Where("namespace_id = ?", file.Namespace.ID)
+		}
 	}
 
 	// Get file to delete
@@ -153,14 +157,22 @@ func FindFiles(db *gorm.DB, file File) ([]File, error) {
 		return nil, err
 	}
 
+	// Try to find file without filtering for namespace
+	if config.Server.SearchInOtherNamespaces &&
+		len(files) == 0 &&
+		len(ignoreNamespace) == 0 {
+
+		return FindFiles(db, config, file, true)
+	}
+
 	return files, nil
 }
 
 // FindFile finds a file
 func FindFile(db *gorm.DB, fileID, userID uint) (*File, error) {
 	a := db.Model(&File{}).Where("uploader = ?", userID)
 
-	// Include ID if set. Otherwise use namespace
+	// Include ID if set
 	if fileID != 0 {
 		a = a.Where("id = ?", fileID)
 	}