add glauth fallback backend

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

changelog/unreleased/glauth-fallback-option.md

@@ -0,0 +1,8 @@
+Enhancement: Add glauth fallback backend
+
+We introduced the `fallback-datastore` config option and the corresponding options to allow configuring a simple chain of two handlers.
+
+Simple, because it is intended for bind and single result search queries. Merging large sets of results is currently out of scope. For now, the implementation will only search the fallback backend if the default backend returns an error or the number of results is 0. This is sufficient to allow an IdP to authenticate users from ocis as well as owncloud 10 as described in the [bridge scenario](https://owncloud.github.io/ocis/bridge/).
+
+https://github.com/owncloud/ocis/pull/649
+https://github.com/owncloud/ocis-glauth/issues/18

docs/extensions/glauth/_index.md

@@ -2,13 +2,11 @@
 title: "GLAuth"
 date: 2018-05-02T00:00:00+00:00
 weight: 10
-geekdocRepo: https://github.com/owncloud/ocis-glauth
-geekdocEditPath: edit/master/docs
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/glauth
 geekdocFilePath: _index.md
 ---
 
-This service provides a simple glauth world API which can be used by clients or other extensions.
+This service provides a [glauth](https://github.com/glauth/glauth) based LDAP proxy for ocis which can be used by clients or other extensions. It allows applications relying on LDAP to access the accounts stored in the ocis accounts service. It can be used to make firewalls or identity providers aware of all users, including guest accounts.
 
-- reiner proxy
-ldap für eos und firewall
-- backend ist der accounts service
+We are using it to make eos aware of all accounts so the native ACLs can be used to persist share information in the storage.

docs/extensions/glauth/building.md

@@ -2,8 +2,8 @@
 title: "Building"
 date: 2018-05-02T00:00:00+00:00
 weight: 30
-geekdocRepo: https://github.com/owncloud/ocis-glauth
-geekdocEditPath: edit/master/docs
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/glauth
 geekdocFilePath: building.md
 ---
 

docs/extensions/glauth/getting-started.md

@@ -2,271 +2,13 @@
 title: "Getting Started"
 date: 2018-05-02T00:00:00+00:00
 weight: 20
-geekdocRepo: https://github.com/owncloud/ocis-glauth
-geekdocEditPath: edit/master/docs
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/glauth
 geekdocFilePath: getting-started.md
 ---
 
 {{< toc >}}
 
-## Installation
+## Configuration Tips
 
-So far we are offering two different variants for the installation. You can choose between [Docker](https://www.docker.com/) or pre-built binaries which are stored on our download mirrors and GitHub releases. Maybe we will also provide system packages for the major distributions later if we see the need for it.
-
-### Docker
-
-TBD
-
-### Binaries
-
-TBD
-
-## Configuration
-
-We provide overall three different variants of configuration. The variant based on environment variables and commandline flags are split up into global values and command-specific values.
-
-### Envrionment variables
-
-If you prefer to configure the service with environment variables you can see the available variables below.
-
-#### Global
-
-GLAUTH_CONFIG_FILE
-: Path to config file, empty default value
-
-GLAUTH_LOG_LEVEL
-: Set logging level, defaults to `info`
-
-GLAUTH_LOG_COLOR
-: Enable colored logging, defaults to `true`
-
-GLAUTH_LOG_PRETTY
-: Enable pretty logging, defaults to `true`
-
-#### Server
-
-GLAUTH_TRACING_ENABLED
-: Enable sending traces, defaults to `false`
-
-GLAUTH_TRACING_TYPE
-: Tracing backend type, defaults to `jaeger`
-
-GLAUTH_TRACING_ENDPOINT
-: Endpoint for the agent, empty default value
-
-GLAUTH_TRACING_COLLECTOR
-: Endpoint for the collector, empty default value
-
-GLAUTH_TRACING_SERVICE
-: Service name for tracing, defaults to `glauth`
-
-GLAUTH_DEBUG_ADDR
-: Address to bind debug server, defaults to `0.0.0.0:9124`
-
-GLAUTH_DEBUG_TOKEN
-: Token to grant metrics access, empty default value
-
-GLAUTH_DEBUG_PPROF
-: Enable pprof debugging, defaults to `false`
-
-GLAUTH_DEBUG_ZPAGES
-: Enable zpages debugging, defaults to `false`
-
-GLAUTH_HTTP_ADDR
-: Address to bind http server, defaults to `0.0.0.0:9120`
-
-GLAUTH_HTTP_NAMESPACE
-: The http namespace
-
-GLAUTH_HTTP_ROOT
-: Root path of http server, defaults to `/`
-
-#### Health
-
-GLAUTH_DEBUG_ADDR
-: Address to debug endpoint, defaults to `0.0.0.0:9124`
-
-### Commandline flags
-
-If you prefer to configure the service with commandline flags you can see the available variables below.
-
-#### Global
-
---config-file
-: Path to config file, empty default value
-
---log-level
-: Set logging level, defaults to `info`
-
---log-color
-: Enable colored logging, defaults to `true`
-
---log-pretty
-: Enable pretty logging, defaults to `true`
-
-#### Server
-
---tracing-enabled
-: Enable sending traces, defaults to `false`
-
---tracing-type
-: Tracing backend type, defaults to `jaeger`
-
---tracing-endpoint
-: Endpoint for the agent, empty default value
-
---tracing-collector
-: Endpoint for the collector, empty default value
-
---tracing-service
-: Service name for tracing, defaults to `glauth`
-
---debug-addr
-: Address to bind debug server, defaults to `0.0.0.0:9124`
-
---debug-token
-: Token to grant metrics access, empty default value
-
---debug-pprof
-: Enable pprof debugging, defaults to `false`
-
---debug-zpages
-: Enable zpages debugging, defaults to `false`
-
---http-addr
-: Address to bind http server, defaults to `0.0.0.0:9120`
-
---http-namespace
-: Namespace for internal services communication, defaults to `com.owncloud.web`
-
---http-root
-: Root path of http server, defaults to `/`
-
-#### Health
-
---debug-addr
-: Address to debug endpoint, defaults to `0.0.0.0:9124`
-
-### Configuration file
-
-So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/glauth/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/glauth.yml`, `${HOME}/.ocis/glauth.yml` or `$(pwd)/config/glauth.yml`.
-
-## Usage
-
-The program provides a few sub-commands on execution. The available configuration methods have already been mentioned above. Generally you can always see a formated help output if you execute the binary via `ocis-glauth --help`.
-
-### Server
-
-The server command is used to start the http and debug server on two addresses within a single process. The http server is serving the general webservice while the debug server is used for health check, readiness check and to server the metrics mentioned below. For further help please execute:
-
-{{< highlight txt >}}
-ocis-glauth server --help
-{{< / highlight >}}
-
-### Health
-
-The health command is used to execute a health check, if the exit code equals zero the service should be up and running, if the exist code is greater than zero the service is not in a healthy state. Generally this command is used within our Docker containers, it could also be used within Kubernetes.
-
-{{< highlight txt >}}
-ocis-glauth health --help
-{{< / highlight >}}
-
-## Metrics
-
-This service provides some [Prometheus](https://prometheus.io/) metrics through the debug endpoint, you can optionally secure the metrics endpoint by some random token, which got to be configured through one of the flag `--debug-token` or the environment variable `GLAUTH_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:9124/metrics`.
-
-go_gc_duration_seconds
-: A summary of the GC invocation durations
-
-go_gc_duration_seconds_sum
-: A summary of the GC invocation durations
-
-go_gc_duration_seconds_count
-: A summary of the GC invocation durations
-
-go_goroutines
-: Number of goroutines that currently exist
-
-go_info
-: Information about the Go environment
-
-go_memstats_alloc_bytes
-: Number of bytes allocated and still in use
-
-go_memstats_alloc_bytes_total
-: Total number of bytes allocated, even if freed
-
-go_memstats_buck_hash_sys_bytes
-: Number of bytes used by the profiling bucket hash table
-
-go_memstats_frees_total
-: Total number of frees
-
-go_memstats_gc_cpu_fraction
-: The fraction of this program's available CPU time used by the GC since the program started
-
-go_memstats_gc_sys_bytes
-: Number of bytes used for garbage collection system metadata
-
-go_memstats_heap_alloc_bytes
-: Number of heap bytes allocated and still in use
-
-go_memstats_heap_idle_bytes
-: Number of heap bytes waiting to be used
-
-go_memstats_heap_inuse_bytes
-: Number of heap bytes that are in use
-
-go_memstats_heap_objects
-: Number of allocated objects
-
-go_memstats_heap_released_bytes
-: Number of heap bytes released to OS
-
-go_memstats_heap_sys_bytes
-: Number of heap bytes obtained from system
-
-go_memstats_last_gc_time_seconds
-: Number of seconds since 1970 of last garbage collection
-
-go_memstats_lookups_total
-: Total number of pointer lookups
-
-go_memstats_mallocs_total
-: Total number of mallocs
-
-go_memstats_mcache_inuse_bytes
-: Number of bytes in use by mcache structures
-
-go_memstats_mcache_sys_bytes
-: Number of bytes used for mcache structures obtained from system
-
-go_memstats_mspan_inuse_bytes
-: Number of bytes in use by mspan structures
-
-go_memstats_mspan_sys_bytes
-: Number of bytes used for mspan structures obtained from system
-
-go_memstats_next_gc_bytes
-: Number of heap bytes when next garbage collection will take place
-
-go_memstats_other_sys_bytes
-: Number of bytes used for other system allocations
-
-go_memstats_stack_inuse_bytes
-: Number of bytes in use by the stack allocator
-
-go_memstats_stack_sys_bytes
-: Number of bytes obtained from system for stack allocator
-
-go_memstats_sys_bytes
-: Number of bytes obtained from system
-
-go_threads
-: Number of OS threads created
-
-promhttp_metric_handler_requests_in_flight
-: Current number of scrapes being served
-
-promhttp_metric_handler_requests_total
-: Total number of scrapes by HTTP status code
+The default setup does not use a fallback backend. It can be enabled by setting the `GLAUTH_FALLBACK_DATASTORE` environment variable. When using `owncloud` make sure to use the full URL to the [ownCloud 10 graph api app](https://github.com/owncloud/graphapi) endpoint, eg.: `GLAUTH_FALLBACK_SERVERS="https://demo.owncloud.com/apps/graphapi/v1.0"`

docs/extensions/glauth/license.md

@@ -2,8 +2,8 @@
 title: "License"
 date: 2018-05-02T00:00:00+00:00
 weight: 40
-geekdocRepo: https://github.com/owncloud/ocis-glauth
-geekdocEditPath: edit/master/docs
+geekdocRepo: https://github.com/owncloud/ocis
+geekdocEditPath: edit/master/docs/extensions/glauth
 geekdocFilePath: license.md
 ---
 

glauth/go.mod

@@ -5,22 +5,23 @@ go 1.13
 require (
 	contrib.go.opencensus.io/exporter/jaeger v0.2.1
 	contrib.go.opencensus.io/exporter/ocagent v0.7.0
-	contrib.go.opencensus.io/exporter/zipkin v0.1.1
+	contrib.go.opencensus.io/exporter/zipkin v0.1.2
 	github.com/GeertJohan/yubigo v0.0.0-20190917122436-175bc097e60e
 	github.com/UnnoTed/fileb0x v1.1.4
-	github.com/glauth/glauth v1.1.3-0.20200228160118-2d4f5d547682
+	github.com/glauth/glauth v1.1.3-0.20201005201919-4d42af8aacbf
 	github.com/go-logr/logr v0.1.0
 	github.com/micro/cli/v2 v2.1.2
 	github.com/micro/go-micro/v2 v2.9.1
 	github.com/nmcclain/asn1-ber v0.0.0-20170104154839-2661553a0484
 	github.com/nmcclain/ldap v0.0.0-20191021200707-3b3b69a7e9e3
 	github.com/oklog/run v1.1.0
-	github.com/openzipkin/zipkin-go v0.2.2
-	github.com/owncloud/ocis/accounts v0.0.0-20200918125107-fcca9faa81c8
+	github.com/openzipkin/zipkin-go v0.2.5
+	github.com/owncloud/ocis/accounts v0.5.2
 	github.com/owncloud/ocis/ocis-pkg v0.0.0-20200918114005-1a0ddd2190ee
+	github.com/prometheus/client_golang v1.7.1
 	github.com/restic/calens v0.2.0
-	github.com/rs/zerolog v1.19.0
-	github.com/spf13/viper v1.7.0
+	github.com/rs/zerolog v1.20.0
+	github.com/spf13/viper v1.7.1
 	go.opencensus.io v0.22.4
 )