mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-19 06:00:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use the ocis-proxy URL to make sure auth works correctly

Browse Source 
Since a recent change in ocis-accounts that makes a distinction between
user id and user name, the thumbnails cannot properly authenticate
against the Reva API endpoint (port 9140) using the provided Bearer
token.

Since the ocis-proxy is handling authentication correctly, the default
setting has been changed here to connect to ocis-proxy.
This commit is contained in:
Vincent Petry
2020-08-06 12:05:46 +02:00
parent 523fad23ed
commit 840d84d22c
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/getting-started.md
View File

@@ -85,7 +85,7 @@ THUMBNAILS_FILESYSTEMSTORAGE_ROOT
: Root path of the filesystem storage directory, defaults to `<os tempdir>/ocis-thumbnails/`
THUMBNAILS_WEBDAVSOURCE_BASEURL
: Base url for a webdav api, defaults to `htp://localhost:9140/remote.php/webdav/`
: Base url for a webdav api, defaults to `https://localhost:9200/remote.php/webdav/`
THUMBNAILS_RESOLUTIONS
: List of resolutions supported by the service, defaults to `["16x16", "32x32", "64x64", "128x128"]
@@ -155,7 +155,7 @@ If you prefer to configure the service with commandline flags you can see the av
: Root path of the filesystem storage directory, defaults to `<os tempdir>/ocis-thumbnails/`
--webdavsource-baseurl
: Base url for a webdav api, defaults to `htp://localhost:9140/remote.php/webdav/`
: Base url for a webdav api, defaults to `https://localhost:9200/remote.php/webdav/`
--thumbnail-resolution
: List of resolutions supported by the service, defaults to `["16x16", "32x32", "64x64", "128x128"]

2
pkg/flagset/flagset.go
View File

@@ -148,7 +148,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
},
&cli.StringFlag{
Name: "webdavsource-baseurl",
Value: "http://localhost:9140/remote.php/webdav/",
Value: "https://localhost:9200/remote.php/webdav/",
Usage: "Base url for a webdav api",
EnvVars: []string{"THUMBNAILS_WEBDAVSOURCE_BASEURL"},
Destination: &cfg.Thumbnail.WebDavSource.BaseURL,

6
pkg/thumbnail/imgsource/webdav.go
View File

@@ -2,6 +2,7 @@ package imgsource
import (
"context"
"crypto/tls"
"fmt"
"image"
"net/http"
@@ -27,12 +28,17 @@ type WebDav struct {
func (s WebDav) Get(ctx context.Context, file string) (image.Image, error) {
u, _ := url.Parse(s.baseURL)
u.Path = path.Join(u.Path, file)
fmt.Printf("url: %s", u.String())
req, err := http.NewRequest(http.MethodGet, u.String(), nil)
if err != nil {
return nil, fmt.Errorf("could not get the image \"%s\" error: %s", file, err.Error())
}
// FIXME: make this configurable!!
http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
auth := authorization(ctx)
fmt.Printf("auth: %s", auth)
if auth == "" {
return nil, fmt.Errorf("could not get image \"%s\" error: authorization is missing", file)
}