Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] connect ocs users endpoint to CS3 admin api #1969

Closed
wants to merge 1 commit into from
Closed

[WIP] connect ocs users endpoint to CS3 admin api #1969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 50 additions & 9 deletions internal/http/services/owncloud/ocs/handlers/cloud/user/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"net/http"

"github.com/cs3org/reva/internal/http/services/owncloud/ocs/response"
"github.com/cs3org/reva/pkg/rhttp/router"
"github.com/cs3org/reva/pkg/user"
)

Expand All @@ -40,17 +41,57 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
}

response.WriteOCSSuccess(w, r, &User{
ID: u.Username,
DisplayName: u.DisplayName,
Email: u.Mail,
})
var head string
head, r.URL.Path = router.ShiftPath(r.URL.Path)
switch head {
case "":
response.WriteOCSSuccess(w, r, &User{
// FIXME Enabled?
UserID: u.Username,
DisplayName: u.DisplayName,
LegacyDisplayName: u.DisplayName,
Email: u.Mail,
UIDNumber: u.UidNumber,
GIDNumber: u.GidNumber,
})
return
case "signing-key":
// FIXME where do we store the signing key?
// is it still nededed? the `oc:downloadURL` webdav property is also filled ... with a different signature
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
return
default:
response.WriteOCSError(w, r, response.MetaNotFound.StatusCode, "Not found", nil)
return
}
}

// TODO move this to the data package and align with the user package
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment on exported type User should be of the form "User ..." (with optional leading article)

// User holds user data
type User struct {
// TODO needs better naming, clarify if we need a userid, a username or both
ID string `json:"id" xml:"id"`
DisplayName string `json:"display-name" xml:"display-name"`
Email string `json:"email" xml:"email"`
Enabled string `json:"enabled" xml:"enabled"`
UserID string `json:"id" xml:"id"` // UserID is mapped to the preferred_name attribute in accounts
DisplayName string `json:"display-name" xml:"display-name"`
LegacyDisplayName string `json:"displayname" xml:"displayname"`
Email string `json:"email" xml:"email"`
Quota *Quota `json:"quota" xml:"quota"`
UIDNumber int64 `json:"uidnumber" xml:"uidnumber"`
GIDNumber int64 `json:"gidnumber" xml:"gidnumber"`
}

// TODO move this to the data package and align with the user package
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment on exported type Quota should be of the form "Quota ..." (with optional leading article)

// Quota holds quota information
type Quota struct {
Free int64 `json:"free" xml:"free"`
Used int64 `json:"used" xml:"used"`
Total int64 `json:"total" xml:"total"`
Relative float32 `json:"relative" xml:"relative"`
Definition string `json:"definition" xml:"definition"`
}

// TODO move this to the data package and align with the user package
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment on exported type SigningKey should be of the form "SigningKey ..." (with optional leading article)

// SigningKey holds the Payload for a GetSigningKey response
type SigningKey struct {
User string `json:"user" xml:"user"`
SigningKey string `json:"signing-key" xml:"signing-key"`
}
123 changes: 104 additions & 19 deletions internal/http/services/owncloud/ocs/handlers/cloud/users/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,95 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
}

var head string
head, r.URL.Path = router.ShiftPath(r.URL.Path)
switch head {
// TODO quite a bit to implement, but the CS3 api now has the admin api that we can use.
var userid string
userid, r.URL.Path = router.ShiftPath(r.URL.Path)
switch userid {
case "":
h.handleUsers(w, r, u)
return
case "groups":
response.WriteOCSSuccess(w, r, &Groups{})
switch r.Method {
case "GET":
// FIXME require admin
// FIXME listusers
h.handleGetUser(w, r, u)
case "POST":
// FIXME require admin
// FIXME adduser
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
default:
response.WriteOCSError(w, r, response.MetaBadRequest.StatusCode, "Only GET and POST are allowed", nil)
}
return
default:
response.WriteOCSError(w, r, response.MetaNotFound.StatusCode, "Not found", nil)
return
var head string
head, r.URL.Path = router.ShiftPath(r.URL.Path)
switch head {
case "":
switch r.Method {
case "GET":
// FIXME getuser
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
case "PUT":
// FIXME require self or admin
// FIXME edituser
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
case "DELETE":
// FIXME require admin
// FIXME deleteuser
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
default:
response.WriteOCSError(w, r, response.MetaBadRequest.StatusCode, "Only GET, PUT and DELETE are allowed", nil)
}
case "enable", "disable":
switch r.Method {
case "PUT":
// FIXME require admin
// FIXME enable user, disable user
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
default:
response.WriteOCSError(w, r, response.MetaBadRequest.StatusCode, "Only PUT is allowed", nil)
}
case "groups":
switch r.Method {
case "GET":
// FIXME require self or admin
// FIXME list user groups
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
case "POST":
// FIXME require admin
// FIXME add to group
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
case "DELETE":
// FIXME require admin
// FIXME remove from group
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
default:
response.WriteOCSError(w, r, response.MetaBadRequest.StatusCode, "Only GET, POST and DELETE are allowed", nil)
}
case "subadmins":
// leale as stub?
switch r.Method {
case "GET":
// FIXME require self or admin
// FIXME list user groups
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
case "POST":
// FIXME require admin
// FIXME add to group
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
case "DELETE":
// FIXME require admin
// FIXME remove from group
response.WriteOCSError(w, r, response.MetaUnknownError.StatusCode, "Not implemented", nil)
default:
response.WriteOCSError(w, r, response.MetaBadRequest.StatusCode, "Only GET, POST and DELETE are allowed", nil)
}
default:
response.WriteOCSError(w, r, response.MetaNotFound.StatusCode, "Not found", nil)
}
}

}

// TODO move this to the data package and align with the user package
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment on exported type Quota should be of the form "Quota ..." (with optional leading article)

// Quota holds quota information
type Quota struct {
Free int64 `json:"free" xml:"free"`
Expand All @@ -89,22 +162,29 @@ type Quota struct {
Definition string `json:"definition" xml:"definition"`
}

// Users holds users data
type Users struct {
Quota *Quota `json:"quota" xml:"quota"`
Email string `json:"email" xml:"email"`
DisplayName string `json:"displayname" xml:"displayname"`
// TODO move this to the data package and align with the user package
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment on exported type User should be of the form "User ..." (with optional leading article)

// User holds user data
type User struct {
Enabled string `json:"enabled" xml:"enabled"`
UserID string `json:"id" xml:"id"` // UserID is mapped to the preferred_name attribute in accounts
DisplayName string `json:"display-name" xml:"display-name"`
LegacyDisplayName string `json:"displayname" xml:"displayname"`
Email string `json:"email" xml:"email"`
Quota *Quota `json:"quota" xml:"quota"`
UIDNumber int64 `json:"uidnumber" xml:"uidnumber"`
GIDNumber int64 `json:"gidnumber" xml:"gidnumber"`
// FIXME home should never be exposed ... even in oc 10
// home
TwoFactorAuthEnabled bool `json:"two_factor_auth_enabled" xml:"two_factor_auth_enabled"`
}

// TODO move this to the data package and align with the user package
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment on exported type Groups should be of the form "Groups ..." (with optional leading article)

// Groups holds group data
type Groups struct {
Groups []string `json:"groups" xml:"groups>element"`
}

func (h *Handler) handleUsers(w http.ResponseWriter, r *http.Request, u *userpb.User) {
func (h *Handler) handleGetUser(w http.ResponseWriter, r *http.Request, u *userpb.User) {
ctx := r.Context()
sublog := appctx.GetLogger(r.Context())

Expand Down Expand Up @@ -145,7 +225,9 @@ func (h *Handler) handleUsers(w http.ResponseWriter, r *http.Request, u *userpb.
relative = float32(float64(used) / float64(total))
}

response.WriteOCSSuccess(w, r, &Users{
response.WriteOCSSuccess(w, r, &User{
//Enabled: u.Enabled, FIXME
UserID: u.Username,
// ocs can only return the home storage quota
Quota: &Quota{
Free: int64(total - used),
Expand All @@ -156,7 +238,10 @@ func (h *Handler) handleUsers(w http.ResponseWriter, r *http.Request, u *userpb.
Relative: relative,
Definition: "default",
},
DisplayName: u.DisplayName,
Email: u.Mail,
DisplayName: u.DisplayName,
LegacyDisplayName: u.DisplayName,
Email: u.Mail,
UIDNumber: u.UidNumber,
GIDNumber: u.GidNumber,
})
}