From 573305f3d3ac55a79639dcb4cc55694ad7a914a5 Mon Sep 17 00:00:00 2001
From: Adam Strzelecki <ono@java.pl>
Date: Tue, 1 Dec 2015 14:49:49 +0100
Subject: LDAP: Optional user name attribute specification

Consider following LDAP search query example:

    (&(objectClass=Person)(|(uid=%s)(mail=%s)))

Right now on first login attempt Gogs will use the text supplied on login form
as the newly created user name. In example query above the text matches against
both e-mail or user name. So if user puts the e-mail then the new Gogs user
name will be e-mail which may be undesired.

Using optional user name attribute setting we can explicitly say we want Gogs
user name to be certain LDAP attribute eg. `uid`, so even user will use e-mail
to login 1st time, the new account will receive correct user name.
---
 templates/admin/auth/edit.tmpl | 4 ++++
 templates/admin/auth/new.tmpl  | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'templates')

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 7423081bd0..e1d1d7660a 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -63,6 +63,10 @@
               <label for="admin_filter">{{.i18n.Tr "admin.auths.admin_filter"}}</label>
               <input id="admin_filter" name="admin_filter" value="{{$cfg.AdminFilter}}">
             </div>
+            <div class="field">
+              <label for="attribute_username">{{.i18n.Tr "admin.auths.attribute_username"}}</label>
+              <input id="attribute_username" name="attribute_username" value="{{$cfg.AttributeUsername}}" placeholder="{{.i18n.Tr "admin.auths.attribute_username_placeholder"}}">
+            </div>
             <div class="field">
               <label for="attribute_name">{{.i18n.Tr "admin.auths.attribute_name"}}</label>
               <input id="attribute_name" name="attribute_name" value="{{$cfg.AttributeName}}">
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
index d342b2df17..448a4ab64a 100644
--- a/templates/admin/auth/new.tmpl
+++ b/templates/admin/auth/new.tmpl
@@ -66,6 +66,10 @@
                   <label for="admin_filter">{{.i18n.Tr "admin.auths.admin_filter"}}</label>
                   <input id="admin_filter" name="admin_filter" value="{{.admin_filter}}">
                 </div>
+                <div class="field">
+                  <label for="attribute_username">{{.i18n.Tr "admin.auths.attribute_username"}}</label>
+                  <input id="attribute_username" name="attribute_username" value="{{.attribute_username}}" placeholder="{{.i18n.Tr "admin.auths.attribute_username_placeholder"}}">
+                </div>
                 <div class="field">
                   <label for="attribute_name">{{.i18n.Tr "admin.auths.attribute_name"}}</label>
                   <input id="attribute_name" name="attribute_name" value="{{.attribute_name}}">
-- 
cgit v1.2.3