allow links without permissions

Signed-off-by: jkoberg <jkoberg@owncloud.com>

internal/http/services/owncloud/ocs/conversions/permissions.go

@@ -51,7 +51,7 @@ var (
 // The value must be in the valid range.
 func NewPermissions(val int) (Permissions, error) {
 	if val == int(PermissionInvalid) {
-		return PermissionInvalid, fmt.Errorf("permissions %d out of range %d - %d", val, PermissionRead, PermissionAll)
+		return PermissionInvalid, nil //fmt.Errorf("permissions %d out of range %d - %d", val, PermissionRead, PermissionAll)
 	} else if val < int(PermissionInvalid) || int(PermissionAll) < val {
 		return PermissionInvalid, ErrPermissionNotInRange
 	}

internal/http/services/owncloud/ocs/conversions/role.go

@@ -222,6 +222,15 @@ func NewUploaderRole() *Role {
 	}
 }
 
+// NewNoneRole creates a role with no permissions
+func NewNoneRole() *Role {
+	return &Role{
+		Name:                   "none",
+		cS3ResourcePermissions: &provider.ResourcePermissions{},
+		ocsPermissions:         PermissionInvalid,
+	}
+}
+
 // NewManagerRole creates an manager role
 func NewManagerRole() *Role {
 	return &Role{
@@ -254,6 +263,10 @@ func NewManagerRole() *Role {
 
 // RoleFromOCSPermissions tries to map ocs permissions to a role
 func RoleFromOCSPermissions(p Permissions) *Role {
+	if p == PermissionInvalid {
+		return NewNoneRole()
+	}
+
 	if p.Contain(PermissionRead) {
 		if p.Contain(PermissionWrite) && p.Contain(PermissionCreate) && p.Contain(PermissionDelete) {
 			if p.Contain(PermissionShare) {

internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go

@@ -497,6 +497,8 @@ func permissionFromRequest(r *http.Request, h *Handler) (*provider.ResourcePermi
 
 // Maps oc10 public link permissions to roles
 var ocPublicPermToRole = map[int]string{
+	// Recipients can do nothing
+	0: "none",
 	// Recipients can view and download contents.
 	1: "viewer",
 	// Recipients can view, download and edit single files.

internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go

@@ -426,27 +426,29 @@ func (h *Handler) extractPermissions(w http.ResponseWriter, r *http.Request, ri
 	}
 
 	permissions := role.OCSPermissions()
-	if ri != nil && ri.Type == provider.ResourceType_RESOURCE_TYPE_FILE {
-		// Single file shares should never have delete or create permissions
-		permissions &^= conversions.PermissionCreate
-		permissions &^= conversions.PermissionDelete
-		if permissions == conversions.PermissionInvalid {
+	/*
+		if ri != nil && ri.Type == provider.ResourceType_RESOURCE_TYPE_FILE {
+			// Single file shares should never have delete or create permissions
+			permissions &^= conversions.PermissionCreate
+			permissions &^= conversions.PermissionDelete
+			if permissions == conversions.PermissionInvalid {
+				return nil, nil, &ocsError{
+					Code:    response.MetaBadRequest.StatusCode,
+					Message: "Cannot set the requested share permissions",
+					Error:   errors.New("cannot set the requested share permissions"),
+				}
+			}
+		}
+
+		existingPermissions := conversions.RoleFromResourcePermissions(ri.PermissionSet).OCSPermissions()
+		if permissions == conversions.PermissionInvalid || !existingPermissions.Contain(permissions) {
 			return nil, nil, &ocsError{
-				Code:    response.MetaBadRequest.StatusCode,
+				Code:    http.StatusNotFound,
 				Message: "Cannot set the requested share permissions",
 				Error:   errors.New("cannot set the requested share permissions"),
 			}
 		}
-	}
-
-	existingPermissions := conversions.RoleFromResourcePermissions(ri.PermissionSet).OCSPermissions()
-	if permissions == conversions.PermissionInvalid || !existingPermissions.Contain(permissions) {
-		return nil, nil, &ocsError{
-			Code:    http.StatusNotFound,
-			Message: "Cannot set the requested share permissions",
-			Error:   errors.New("cannot set the requested share permissions"),
-		}
-	}
+	*/
 
 	role = conversions.RoleFromOCSPermissions(permissions)
 	roleMap := map[string]string{"name": role.Name}