1f349/go-webdav
4
0
Fork 0
mirror of https://github.com/1f349/go-webdav.git synced 2024-12-22 08:14:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

carddav: add current-user-principal to server

Browse Source
This commit is contained in:
Simon Ser 2020-01-20 10:56:25 +01:00
parent d8ce7d353d
commit 3a61646ab4
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
4 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
carddav/server.go
View File

@ -223,6 +223,10 @@ func (b *backend) propfindAddressBook(propfind *internal.Propfind, ab *AddressBo
addressBookHomeSetName: func(*internal.RawXMLValue) (interface{}, error) {
return &addressbookHomeSet{Href: "/"}, nil
},
// TODO: this should be set on all resources
internal.CurrentUserPrincipalName: func(*internal.RawXMLValue) (interface{}, error) {
return &internal.CurrentUserPrincipal{Href: "/"}, nil
},
}
if ab.MaxResourceSize > 0 {

10
client.go
View File

@ -1,8 +1,8 @@
package webdav
import (
"encoding/xml"
"net/http"
"fmt"
"github.com/emersion/go-webdav/internal"
)
@ -24,18 +24,20 @@ func (c *Client) SetBasicAuth(username, password string) {
}
func (c *Client) FindCurrentUserPrincipal() (string, error) {
name := xml.Name{"DAV:", "current-user-principal"}
propfind := internal.NewPropNamePropfind(name)
propfind := internal.NewPropNamePropfind(internal.CurrentUserPrincipalName)
resp, err := c.c.PropfindFlat("/", propfind)
if err != nil {
return "", err
}
var prop currentUserPrincipal
var prop internal.CurrentUserPrincipal
if err := resp.DecodeProp(&prop); err != nil {
return "", err
}
if prop.Unauthenticated != nil {
return "", fmt.Errorf("webdav: unauthenticated")
}
return prop.Href, nil
}

10
elements.go
View File

@ -1,10 +0,0 @@
package webdav
import (
"encoding/xml"
)
type currentUserPrincipal struct {
XMLName xml.Name `xml:"DAV: current-user-principal"`
Href string `xml:"href"`
}

27
internal/elements.go
View File

@ -11,6 +11,17 @@ import (
const Namespace = "DAV:"
var (
ResourceTypeName = xml.Name{"DAV:", "resourcetype"}
DisplayNameName = xml.Name{"DAV:", "displayname"}
GetContentLengthName = xml.Name{"DAV:", "getcontentlength"}
GetContentTypeName = xml.Name{"DAV:", "getcontenttype"}
GetLastModifiedName = xml.Name{"DAV:", "getlastmodified"}
GetETagName = xml.Name{"DAV:", "getetag"}
CurrentUserPrincipalName = xml.Name{"DAV:", "current-user-principal"}
)
type Status struct {
Code int
Text string
@ -302,15 +313,6 @@ type GetLastModified struct {
LastModified Time `xml:",chardata"`
}
var (
ResourceTypeName = xml.Name{"DAV:", "resourcetype"}
DisplayNameName = xml.Name{"DAV:", "displayname"}
GetContentLengthName = xml.Name{"DAV:", "getcontentlength"}
GetContentTypeName = xml.Name{"DAV:", "getcontenttype"}
GetLastModifiedName = xml.Name{"DAV:", "getlastmodified"}
GetETagName = xml.Name{"DAV:", "getetag"}
)
// https://tools.ietf.org/html/rfc4918#section-14.5
type Error struct {
XMLName xml.Name `xml:"DAV: error"`
@ -322,3 +324,10 @@ type DisplayName struct {
XMLName xml.Name `xml:"DAV: displayname"`
Name string `xml:",chardata"`
}
// https://tools.ietf.org/html/rfc5397#section-3
type CurrentUserPrincipal struct {
XMLName xml.Name `xml:"DAV: current-user-principal"`
Href string `xml:"href,omitempty"`
Unauthenticated *struct{} `xml:"unauthenticated,omitempty"`
}