summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-02-01 11:33:22 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-02-01 11:33:22 +0100
commit02afa6793cca042f8563b0e26472606c743d76f5 (patch)
treec2242a77660c2f07fefe3b0879b17a4e743bee53 /lib
parent0197549d57bd32ee933ee775c625ed6fc5f5eec8 (diff)
downloadgitlab-ce-02afa6793cca042f8563b0e26472606c743d76f5.tar.gz
Use only one header to send git blobs
Diffstat (limited to 'lib')
-rw-r--r--lib/api/repositories.rb6
-rw-r--r--lib/gitlab/workhorse.rb21
2 files changed, 23 insertions, 4 deletions
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index 0f4cd2443b0..c95d2d2001d 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -57,8 +57,7 @@ module API
not_found! "File" unless blob
content_type 'text/plain'
- header 'Gitlab-Workhorse-Repo-Path', repo.path_to_repo
- header 'Gitlab-Workhorse-Send-Blob', blob.id
+ header *Gitlab::Workhorse.send_git_blob(repo, blob)
end
# Get a raw blob contents by blob sha
@@ -84,8 +83,7 @@ module API
env['api.format'] = :txt
content_type blob.mime_type
- header 'Gitlab-Workhorse-Repo-Path', repo.path_to_repo
- header 'Gitlab-Workhorse-Send-Blob', blob.id
+ header *Gitlab::Workhorse.send_git_blob(repo, blob)
end
# Get a an archive of the repository
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
new file mode 100644
index 00000000000..ff6fbf0b5c1
--- /dev/null
+++ b/lib/gitlab/workhorse.rb
@@ -0,0 +1,21 @@
+require 'base64'
+require 'json'
+
+module Gitlab
+ class Workhorse
+ class << self
+ def send_git_blob(repository, blob)
+ params_hash = {
+ 'RepoPath' => repository.path_to_repo,
+ 'BlobId' => blob.id,
+ }
+ params = Base64.urlsafe_encode64(JSON.dump(params_hash))
+
+ [
+ 'Gitlab-Workhorse-Send-Data',
+ "git-blob:#{params}",
+ ]
+ end
+ end
+ end
+end \ No newline at end of file