Commit Graph
14 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
2014-07-10 23:43:42 +03:00
Oleg GirkoandMarvin Frick edaaac2f55 Make SSH keys synchronisation with LDAP not delete keys added by users.
This is done by using a separate LDAPKey model (inherited from Key)
for storing SSH keys which came from LDAP.
These keys can be viewed from user profile, but they can not be deleted.

Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com> (+2 squashed commits)
Squashed commits:
[52b3816] Made SSH key synchronisation with LDAP configurable.

Now it can be turned on or off using configuration option
sync_ssh_keys in ldap section.
The default is off to preserve compatibility with old behaviour.

Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com>
[02f988d] Synchronise LDAP users SSH keys from LDAP automatically.

SSH public keys are synchronised from sshPublicKey LDAP attribute
upon login attempt and during regular LDAP security checks.
New keys are added, old keys not present in LDAP are deleted.

Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com> (+1 squashed commit)
Squashed commits:
[f087fbc] Make Gitlab::LDAP::Person.entry method public.

This is needed to allow access control methods to access
arbitrary LDAP attributes.

Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com>
2014-07-08 12:31:11 +02:00
Dmitriy Zaporozhets cb74c014ea Key strong params
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 17:00:05 +03:00
Dmitry Medvinsky fefab47456 Fix /:username.keys response content type
Currently this method responds with `text/html`. It is kind of unusable
if you open it in a browser. The browser thinks it is HTML and renders
it as HTML, meaning new lines are dropped. So it's very hard to
distinguish where the key starts and where it ends.

This commit changes the content type header to `text/plain`.
2014-03-20 19:09:14 +04:00
Johannes Schleifenbaum f10153818b Split the user ssh keys by newline, not the characters "\n"
before:
GET /user.keys

ssh-rsa ...\nssh-rsa ...\nssh-rsa ...

after:
GET /user.keys

ssh-rsa ...
ssh-rsa ...
sha-rsa ...
2014-02-11 19:24:23 +01:00
GitLab 46ad09bf70 code refactor as per standards 2014-02-11 19:04:47 +05:30
GitLab b1492a2a62 sync with upstream for ease to merge 2014-02-06 19:47:21 +05:30
GitLab 319f355aed merge with upstream master 2014-02-06 16:56:20 +05:30
GitLab 1c9a41e0d5 adding tests for the ssh keys feature 2014-02-06 14:42:59 +05:30
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
devaroop b9d58c4cec getting user keys publically through http without any authentication, the github way. E.g: http://github.com/devaroop.keys
changelog updated to include ssh key retrieval feature update
2013-10-03 12:50:33 +05:30
devaroop b6bd4856a3 getting user keys publically through http without any authentication, the github way. E.g: http://github.com/devaroop.keys 2013-10-02 20:39:29 +05:30
Dmitriy Zaporozhets 05a7e8b9c0 Better design for SSH keys page 2013-06-24 19:25:10 +03:00
Dmitriy Zaporozhets 3e09e6f7b8 Move Profile related controllers under Profiles:: module 2013-06-24 18:24:14 +03:00