From d9d55bcbab49ac08e0dc311d8b3fa38b4291c6e5 Mon Sep 17 00:00:00 2001 From: Stephen J Day Date: Thu, 11 Jun 2015 17:06:35 -0700 Subject: [PATCH] Minor formatting fixes related to htpasswd auth Signed-off-by: Stephen J Day --- docs/configuration.md | 14 +++++++------- registry/auth/htpasswd/access_test.go | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index 0771d5d2..c7f20133 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -108,9 +108,9 @@ auth: service: token-service issuer: registry-token-issuer rootcertbundle: /root/certs/bundle - htpasswd: - realm: basic-realm - path: /path/to/htpasswd + htpasswd: + realm: basic-realm + path: /path/to/htpasswd middleware: registry: - name: ARegistryMiddleware @@ -603,9 +603,9 @@ auth: service: token-service issuer: registry-token-issuer rootcertbundle: /root/certs/bundle - htpasswd: - realm: basic-realm - path: /path/to/htpasswd + htpasswd: + realm: basic-realm + path: /path/to/htpasswd ``` The `auth` option is **optional**. There are @@ -719,7 +719,7 @@ For more information about Token based authentication configuration, see the [sp ### htpasswd The _htpasswd_ authentication backed allows one to configure basic auth using an -[Apache HTPasswd File](http://httpd.apache.org/docs/2.4/programs/htpasswd.html). +[Apache HTPasswd File](https://httpd.apache.org/docs/2.4/programs/htpasswd.html). Only [`bcrypt`](http://en.wikipedia.org/wiki/Bcrypt) format passwords are supported. Entries with other hash types will be ignored. The htpasswd file is loaded once, at startup. If the file is invalid, the registry will display and diff --git a/registry/auth/htpasswd/access_test.go b/registry/auth/htpasswd/access_test.go index 5cb2d7c9..ea0de425 100644 --- a/registry/auth/htpasswd/access_test.go +++ b/registry/auth/htpasswd/access_test.go @@ -85,8 +85,8 @@ func TestBasicAccessController(t *testing.T) { } nonbcrypt := map[string]struct{}{ - "bilbo": struct{}{}, - "DeokMan": struct{}{}, + "bilbo": {}, + "DeokMan": {}, } for i := 0; i < len(testUsers); i++ {