Create home directory on login on configured home storage providers a…

…nd other stuff (#469)

.mailmap

@@ -1,2 +1,3 @@
 Aritz Brosa <[email protected]> zazola <[email protected]>
 Giuseppe Lo Presti <[email protected]> Giuseppe <[email protected]>
+Michael D'Silva <[email protected]>

CONTRIBUTORS.md

@@ -8,5 +8,6 @@
 - Ilja Neumann <[email protected]>
 - Jörn Friedrich Dreyer <[email protected]>
 - Michael D'Silva <[email protected]>
+- Michael D'Silva <[email protected]>
 - Mohitty <[email protected]>
 - Thomas Boerger <[email protected]>

cmd/reva/common.go

@@ -77,10 +77,6 @@ func readConfig() (*config, error) {
 }
 
 func writeConfig(c *config) error {
-	if c.AuthHeader == "" {
-		c.AuthHeader = "x-access-token"
-	}
-
 	data, err := json.Marshal(c)
 	if err != nil {
 		return err
@@ -89,8 +85,7 @@ func writeConfig(c *config) error {
 }
 
 type config struct {
-	Host       string `json:"host"`
-	AuthHeader string `json:"auth_header"`
+	Host string `json:"host"`
 }
 
 func read(r *bufio.Reader) (string, error) {

cmd/reva/gen/gen.go

@@ -104,13 +104,6 @@ skip_methods = ["/status.php"]
 [http.middlewares.auth.token_managers.jwt]
 secret = "{{.TokenSecret}}"
 
-[http.middlewares.auth.token_strategies.header]
-header = "X-Access-Token"
-
-[http.middlewares.auth.token_writers.header]
-header = "X-Access-Token"
-
-
 # GRPC interceptors
 
 [grpc.interceptors.trace]
@@ -126,15 +119,11 @@ priority = 300
 [grpc.interceptors.auth]
 priority = 400
 # keys for grpc metadata are always lowercase, so interceptors headers need to use lowercase.
-header = "x-access-token"
 token_strategy = "header"
 token_manager = "jwt"
 # GenerateAccessToken contains the credentials in the payload. Skip auth, otherwise services cannot obtain a token.
 skip_methods = ["/cs3.authproviderv1beta1.AuthService/GenerateAccessToken"]
 
-[grpc.interceptors.auth.token_strategies.header]
-header = "X-Access-Token"
-
 [grpc.interceptors.auth.token_managers.jwt]
 secret = "{{.TokenSecret}}"
 

cmd/reva/grpc.go

@@ -30,8 +30,6 @@ import (
 	"google.golang.org/grpc/metadata"
 )
 
-const defaultHeader = "x-access-token"
-
 func getAuthContext() context.Context {
 	ctx := context.Background()
 	// read token from file
@@ -41,7 +39,7 @@ func getAuthContext() context.Context {
 		return ctx
 	}
 	ctx = token.ContextSetToken(ctx, t)
-	ctx = metadata.AppendToOutgoingContext(ctx, defaultHeader, t)
+	ctx = metadata.AppendToOutgoingContext(ctx, token.TokenHeader, t)
 	return ctx
 }
 

cmd/revad/runtime/runtime.go

@@ -33,6 +33,7 @@ import (
 	"github.com/cs3org/reva/pkg/logger"
 	"github.com/cs3org/reva/pkg/rgrpc"
 	"github.com/cs3org/reva/pkg/rhttp"
+	"github.com/cs3org/reva/pkg/sharedconf"
 	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
@@ -44,6 +45,7 @@ import (
 
 // Run runs a reva server with the given config file and pid file.
 func Run(mainConf map[string]interface{}, pidFile string) {
+	parseSharedConfOrDie(mainConf["shared"])
 	coreConf := parseCoreConfOrDie(mainConf["core"])
 	logConf := parseLogConfOrDie(mainConf["log"])
 
@@ -333,6 +335,13 @@ func parseCoreConfOrDie(v interface{}) *coreConf {
 	return c
 }
 
+func parseSharedConfOrDie(v interface{}) {
+	if err := sharedconf.Decode(v); err != nil {
+		fmt.Fprintf(os.Stderr, "error decoding shared config: %s\n", err.Error())
+		os.Exit(1)
+	}
+}
+
 func parseLogConfOrDie(v interface{}) *logConf {
 	c := &logConf{}
 	if err := mapstructure.Decode(v, c); err != nil {