From 222675f4796a5abec5b0b7cdcfc91fdba3cf5cf2 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 27 Sep 2021 03:39:36 +0100 Subject: [PATCH] Allow LDAP Sources to provide Avatars (#16851) * Allow LDAP Sources to provide Avatars Add setting to LDAP source to allow it to provide an Avatar. Currently this is required to point to the image bytes. Fix #4144 Signed-off-by: Andrew Thornton * Rename as Avatar Attribute (drop JPEG) Signed-off-by: Andrew Thornton * Always synchronize avatar if there is change Signed-off-by: Andrew Thornton * Actually get the avatar from the ldap Signed-off-by: Andrew Thornton * clean-up Signed-off-by: Andrew Thornton * use len()>0 rather than != "" Signed-off-by: Andrew Thornton * slight shortcut in IsUploadAvatarChanged Signed-off-by: Andrew Thornton Co-authored-by: techknowlogick --- doc/usage/command-line.en-us.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/usage/command-line.en-us.md b/doc/usage/command-line.en-us.md index 0bc8d70f..b12400c5 100644 --- a/doc/usage/command-line.en-us.md +++ b/doc/usage/command-line.en-us.md @@ -152,6 +152,7 @@ Admin operations: - `--surname-attribute value`: The attribute of the user’s LDAP record containing the user’s surname. - `--email-attribute value`: The attribute of the user’s LDAP record containing the user’s email address. Required. - `--public-ssh-key-attribute value`: The attribute of the user’s LDAP record containing the user’s public ssh key. + - `--avatar-attribute value`: The attribute of the user’s LDAP record containing the user’s avatar. - `--bind-dn value`: The DN to bind to the LDAP server with when searching for the user. - `--bind-password value`: The password for the Bind DN, if any. - `--attributes-in-bind`: Fetch attributes in bind DN context. @@ -177,6 +178,7 @@ Admin operations: - `--surname-attribute value`: The attribute of the user’s LDAP record containing the user’s surname. - `--email-attribute value`: The attribute of the user’s LDAP record containing the user’s email address. - `--public-ssh-key-attribute value`: The attribute of the user’s LDAP record containing the user’s public ssh key. + - `--avatar-attribute value`: The attribute of the user’s LDAP record containing the user’s avatar. - `--bind-dn value`: The DN to bind to the LDAP server with when searching for the user. - `--bind-password value`: The password for the Bind DN, if any. - `--attributes-in-bind`: Fetch attributes in bind DN context. @@ -202,6 +204,7 @@ Admin operations: - `--surname-attribute value`: The attribute of the user’s LDAP record containing the user’s surname. - `--email-attribute value`: The attribute of the user’s LDAP record containing the user’s email address. Required. - `--public-ssh-key-attribute value`: The attribute of the user’s LDAP record containing the user’s public ssh key. + - `--avatar-attribute value`: The attribute of the user’s LDAP record containing the user’s avatar. - `--user-dn value`: The user’s DN. Required. - Examples: - `gitea admin auth add-ldap-simple --name ldap --security-protocol unencrypted --host mydomain.org --port 389 --user-dn "cn=%s,ou=Users,dc=mydomain,dc=org" --user-filter "(&(objectClass=posixAccount)(cn=%s))" --email-attribute mail` @@ -223,6 +226,7 @@ Admin operations: - `--surname-attribute value`: The attribute of the user’s LDAP record containing the user’s surname. - `--email-attribute value`: The attribute of the user’s LDAP record containing the user’s email address. - `--public-ssh-key-attribute value`: The attribute of the user’s LDAP record containing the user’s public ssh key. + - `--avatar-attribute value`: The attribute of the user’s LDAP record containing the user’s avatar. - `--user-dn value`: The user’s DN. - Examples: - `gitea admin auth update-ldap-simple --id 1 --name "my ldap auth source"`