Auth Proxy improvements #6895

Merged
merged 2 commits into from Dec 14, 2016

Projects

None yet

4 participants

@seuf
Contributor
seuf commented Dec 9, 2016

Hi,
I've rebased grafana/master on @roelgerrits authproxy_ldap branch.
It allow Auth proxy based authent to sync logged in user with Ldap informations.
For example you can use a client certificate which contain user name and login, then search for his role and organisation in Ldap.

The previous pr was #4277
It concern issues #2549 and #5764

@CLAassistant
CLAassistant commented Dec 9, 2016 edited

CLA assistant check
All committers have signed the CLA.

seuf added some commits Feb 23, 2016
@seuf @seuf seuf Auth Proxy improvements
- adds the option to use ldap groups for authorization in combination with an auth proxy
- adds an option to limit where auth proxy requests come from by configure a list of ip's
- fixes a security issue, session could be reused
ae27c17
@seuf seuf Auth Proxy improvements - adds the option to use ldap groups for auth…
…orization in combination with an auth proxy - adds an option to limit where auth proxy requests come from by configure a list of ip's - fixes a security issue, session could be reused
12a82bc
@torkelo
Member
torkelo commented Dec 14, 2016

This is looking good, hope to get change to review & test soon.

@torkelo torkelo added this to the 4.1.0 milestone Dec 14, 2016
@torkelo torkelo self-requested a review Dec 14, 2016
@torkelo torkelo self-assigned this Dec 14, 2016
@torkelo torkelo merged commit 12a82bc into grafana:master Dec 14, 2016

2 checks passed

ci/circleci Your tests passed on CircleCI!
Details
licence/cla Contributor License Agreement is signed.
Details
@roelgerrits

@seuf @torkelo Thanks for merging my code change!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment