lsst-git-lfs-s3 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f2e6af3ea634831479beea0be65359bb3695630
-  data.tar.gz: ba46fab82fb3cae3ade60ab107405ad0f9892a05
+  metadata.gz: 437091d8955c2a60f97a25e2ea0594da402e0cba
+  data.tar.gz: ff1da32dc48a5cd13b48f78b605e261311ccc4e3
 SHA512:
-  metadata.gz: ee7b0f6ee3a385165cf391f78c84477dd841a40e52f7e7e73e548a366c729011adc46d4dc40aad14d6e188cd0576b2b23ab7ed2bf9f43cd9b3f0a2cf62a4c2f9
-  data.tar.gz: bd89548d86872b68ea9151b40f1fca437d99f730046453ca376a2249fd09bb0fc128aadd287413165295d3fda8dead9b36c136c09fcca90d2b9f5ea28486d8ea
+  metadata.gz: d6be37b7523a881c3ab2ed9537966f814db9478535ef08c919df31c5f99a713562a870d4c2cff863de3e31d07ddcb68b9bba192bbc168a4da0fd424f6e694c9d
+  data.tar.gz: ba42f8a39304e878996f7c9f3da82276e0225230ad9d34aa4444fc1c95c4b1af0c80c1c71b69b7b0fe0a7e057911e942fbaadc11b070e170ce75738666820f3e

data/.gitignore

@@ -4,4 +4,8 @@
 logs
 pkg
 Gemfile.lock
-vendor
+vendor
+
+# Emacs
+#*#
+*~

data/bin/git-lfs-s3

@@ -10,6 +10,7 @@ GitLfsS3::Application.set :aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY']
 GitLfsS3::Application.set :s3_bucket, ENV['S3_BUCKET']
 GitLfsS3::Application.set :server_url, ENV['LFS_SERVER_URL']
 GitLfsS3::Application.set :public_server, (ENV['LFS_PUBLIC_SERVER'] == 'true')
+GitLfsS3::Application.set :ceph_s3, (ENV['LFS_CEPH_S3'] == 'true')
 GitLfsS3::Application.set :logger, Logger.new(STDOUT)
 
 GitLfsS3::Application.on_authenticate do |username, password, is_safe|

data/lib/git-lfs-s3.rb

@@ -1,6 +1,6 @@
-require 'sinatra/base'
-require 'aws-sdk'
-require 'multi_json'
+require "sinatra/base"
+require "aws-sdk"
+require "multi_json"
 
 require "git-lfs-s3/aws"
 require "git-lfs-s3/services/upload"

data/lib/git-lfs-s3/application.rb

@@ -90,7 +90,9 @@ module GitLfsS3
     post '/verify', provides: 'application/vnd.git-lfs+json' do
       data = MultiJson.load(request.body.tap { |b| b.rewind }.read)
       object = object_data(data['oid'])
-
+      if settings.public_server and settings.ceph_s3
+        object.acl.put(acl: "public-read")
+      end
       if object.exists? && object.size == data['size']
         status 200
       else

data/lib/git-lfs-s3/services/ceph_presigner.rb

@@ -0,0 +1,24 @@
+require 'base64'
+require 'date'
+require 'digest/sha1'
+require 'openssl'
+require 'uri'
+
+module GitLfsS3
+  module CephPresignerService
+    extend self
+    extend AwsHelpers
+
+    def signed_url(obj)
+      expire_at = (DateTime.now + 1).strftime("%s")
+      secret_access_key = Aws.config[:secret_access_key]
+      access_key_id = Aws.config[:access_key_id]
+      endpoint = Aws.config[:endpoint]
+      digest = OpenSSL::Digest.new('sha1')
+      can_string = "PUT\n\napplication/octet-stream\n#{expire_at}\n/#{obj.bucket_name}/#{obj.key}"
+      hmac = OpenSSL::HMAC.digest(digest, secret_access_key, can_string)
+      signature = URI.escape(Base64.encode64(hmac).strip, /[\+=?@$&,\/:;\?]/)
+      "#{endpoint}/#{obj.bucket_name}/#{obj.key}?Signature=#{signature}&AWSAccessKeyId=#{access_key_id}&Expires=#{expire_at}"
+    end
+  end
+end

data/lib/git-lfs-s3/services/upload/base.rb

@@ -23,6 +23,10 @@ module GitLfsS3
       def server_url
         GitLfsS3::Application.settings.server_url
       end
+
+      def ceph_s3
+        GitLfsS3::Application.settings.ceph_s3
+      end
     end
   end
 end

data/lib/git-lfs-s3/services/upload/upload_required.rb

@@ -1,3 +1,5 @@
+require "git-lfs-s3/services/ceph_presigner"
+
 module GitLfsS3
   module UploadService
     class UploadRequired < Base
@@ -26,7 +28,11 @@ module GitLfsS3
       private
 
       def upload_destination
-        object.presigned_url(:put)
+        if ceph_s3
+          GitLfsS3::CephPresignerService::signed_url(object)
+        else
+          object.presigned_url(:put)
+        end
       end
 
       def upload_headers

data/lib/git-lfs-s3/version.rb

@@ -1,3 +1,3 @@
 module GitLfsS3
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lsst-git-lfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10'
 description: LSST's Git LFS server that uses S3 for the storage backend.
@@ -76,7 +76,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
@@ -85,6 +85,7 @@ files:
 - lib/git-lfs-s3.rb
 - lib/git-lfs-s3/application.rb
 - lib/git-lfs-s3/aws.rb
+- lib/git-lfs-s3/services/ceph_presigner.rb
 - lib/git-lfs-s3/services/upload.rb
 - lib/git-lfs-s3/services/upload/base.rb
 - lib/git-lfs-s3/services/upload/object_exists.rb
@@ -100,17 +101,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: LSST's Git LFS server that uses S3 for the storage backend by providing presigned