alexvanin/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Minor formatting fixes related to htpasswd auth

Browse source 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2015-06-11 17:06:35 -07:00
parent 01f730ad71
commit d9d55bcbab
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
docs/configuration.md
View file

@ -108,9 +108,9 @@ auth:
service: token-service service: token-service
issuer: registry-token-issuer issuer: registry-token-issuer
rootcertbundle: /root/certs/bundle rootcertbundle: /root/certs/bundle
htpasswd: htpasswd:
realm: basic-realm realm: basic-realm
path: /path/to/htpasswd path: /path/to/htpasswd
middleware: middleware:
registry: registry:
- name: ARegistryMiddleware - name: ARegistryMiddleware
@ -603,9 +603,9 @@ auth:
service: token-service service: token-service
issuer: registry-token-issuer issuer: registry-token-issuer
rootcertbundle: /root/certs/bundle rootcertbundle: /root/certs/bundle
htpasswd: htpasswd:
realm: basic-realm realm: basic-realm
path: /path/to/htpasswd path: /path/to/htpasswd
``` ```
The `auth` option is **optional**. There are The `auth` option is **optional**. There are
@ -719,7 +719,7 @@ For more information about Token based authentication configuration, see the [sp
### htpasswd ### htpasswd
The _htpasswd_ authentication backed allows one to configure basic auth using an 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 Only [`bcrypt`](http://en.wikipedia.org/wiki/Bcrypt) format passwords are
supported. Entries with other hash types will be ignored. The htpasswd file is 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 loaded once, at startup. If the file is invalid, the registry will display and

4
registry/auth/htpasswd/access_test.go
View file

@ -85,8 +85,8 @@ func TestBasicAccessController(t *testing.T) {
} }
nonbcrypt := map[string]struct{}{ nonbcrypt := map[string]struct{}{
"bilbo": struct{}{}, "bilbo": {},
"DeokMan": struct{}{}, "DeokMan": {},
} }
for i := 0; i < len(testUsers); i++ { for i := 0; i < len(testUsers); i++ {