Commit graph

25 commits

Author SHA1 Message Date
Patricio Cano
2772109ac1 Handle LFS token creation and retrieval in the same method, and in the same Redis connection.
Reset expiry time of token, if token is retrieved again before it expires.
2016-09-28 12:13:48 -05:00
Patricio Cano
a4944fb715 Do not regenerate the lfs_token every time git-lfs-authenticate is called, instead return the saved token if one is present. 2016-09-27 13:23:51 -05:00
Kamil Trzcinski
3c1bb3432b Revert "Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043"
This reverts commit 6d43c95b70.
2016-09-19 16:34:32 +02:00
Kamil Trzcinski
6d43c95b70 Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043 2016-09-19 13:45:28 +02:00
Kamil Trzcinski
f7ae37c1d0 Simplify checking of allowed abilities in git_http_client_controller 2016-09-16 13:34:05 +02:00
Kamil Trzcinski
1954cb80fd Added missing LFS specs 2016-09-16 11:12:22 +02:00
Kamil Trzcinski
83b643a014 Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-token
# Conflicts:
#	app/controllers/projects/git_http_client_controller.rb
#	app/helpers/lfs_helper.rb
#	lib/gitlab/auth.rb
#	spec/requests/lfs_http_spec.rb
2016-09-15 21:16:38 +02:00
Patricio Cano
71aff7f6a3 Use special characters for lfs+deploy-key to prevent a someone from creating a user with this username, and method name refactoring. 2016-09-15 12:21:00 -05:00
Patricio Cano
48f1a61fd5 Refactored LFS auth logic when using SSH to use its own API endpoint /lfs_authenticate and added tests. 2016-09-15 12:21:00 -05:00
Patricio Cano
cb85cf1f0a Refactor LFS token logic to use a Redis key instead of a DB field, making it a 1 use only token. 2016-09-15 12:21:00 -05:00
Patricio Cano
e40e3fdc82 Added LFS support to SSH
- Required on the GitLab Rails side is mostly authentication and API related.
2016-09-15 12:21:00 -05:00
Kamil Trzcinski
eed5c58d85 Verify permission of build in context of dependent project 2016-09-15 16:36:39 +02:00
Kamil Trzcinski
e3a422c267 Fix LFS specs 2016-09-15 16:17:57 +02:00
Kamil Trzcinski
548169cfb5 Fix most of specs 2016-09-15 15:40:53 +02:00
Jacob Vosmaer
c87540ed46 Verify JWT messages from gitlab-workhorse 2016-09-05 15:05:31 +02:00
Patricio Cano
cf37d623e1 Renamed enable_lfs to lfs_enabled for the Project field, and related fixes. 2016-08-30 17:17:45 -05:00
Patricio Cano
9d8fbcc038 Added project specific enable/disable setting for LFS 2016-08-30 16:17:41 -05:00
Jacob Vosmaer
6e6ad3e2fc Fix typo 2016-08-11 15:05:49 +02:00
Jacob Vosmaer
26b98bfff8 Improve validation of X-Gitlab-Lfs-Tmp header 2016-08-10 17:40:20 +02:00
Jacob Vosmaer
71952d057d Handle custom Git LFS content type 2016-07-22 17:56:10 +02:00
Jacob Vosmaer
df3ca41e62 Remove obsolete code 2016-07-22 17:54:04 +02:00
Jacob Vosmaer
0d9752446d Add LFS controllers 2016-07-22 17:54:04 +02:00
Kamil Trzcinski
e300dac293 Fix LFS specs 2016-07-15 15:06:19 +02:00
Kamil Trzcinski
bb9f827ddc Fix fetching LFS objects for private CI projects 2016-07-15 14:23:26 +02:00
Kamil Trzcinski
86f39fece2 Refactor LFS specs to use requests instead of LfsRouter 2016-07-15 14:04:24 +02:00