lsst-git-lfs-s3 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba5d40163f92542e7c934d5a755911f769d7903
-  data.tar.gz: f77dd021ea75fc075007f80ad009c547f68956db
+  metadata.gz: 6e5329df126cbda9ae4c2d57087112eb606fd122
+  data.tar.gz: 2bebe69bc7b1365b0de092ac70540277f377ae8d
 SHA512:
-  metadata.gz: 56dbf305a4b992ae9919139156aba41d85460bb4bcd2ccc1bbc0a3656f86372edb72cb9de233d20dc810bc0ae849abbcbc96fa40bc5900ec1fe455121cb4f032
-  data.tar.gz: 69852595fa41ed2361c2044ec27275719c2185e6b89455c9889306b18c68159198743af93835cc79f16a001eef5a3979c0d8ef7cb518cf696d705384d5b4f9a5
+  metadata.gz: 922ef0899f0146774d03d4ac26aadefa7ed2ae1419a20b92bc4044a6fae4b8a95c134ef27d5db4d71125d03ebb963863ef2db56ecaaffaabf508565402e18243
+  data.tar.gz: efb4c65c139b9b478dd3ca930ae9cad5b709be4e98394245315377a1aaf877a8a18075c568064a32923ad4a29124b02d575793cbae06d175491e7956b8173392

data/bin/git-lfs-s3

@@ -11,8 +11,20 @@ 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 :endpoint, ENV['LFS_CEPH_ENDPOINT']
 GitLfsS3::Application.set :logger, Logger.new(STDOUT)
 
+if GitLfsS3::Application.settings.ceph_s3
+  Aws.config.update(
+    endpoint: ENV['LFS_CEPH_ENDPOINT'],
+    access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+    secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+    force_path_style: true,
+    region: 'us-east-1',
+    # ssl_ca_bundle: '/usr/local/etc/openssl/cert.pem' # Required for brew install on a mac.
+  )
+end
+
 GitLfsS3::Application.on_authenticate do |username, password, is_safe|
   if is_safe # Whether the HTTP method is safe (GET, HEAD)
     true

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

@@ -35,7 +35,14 @@ module GitLfsS3
         @auth.credentials[0], @auth.credentials[1], request.safe?
       )
     end
-    
+
+    def protected!
+      unless authorized?
+        response['WWW-Authenticate'] = %(Basic realm="Restricted Area")
+        throw(:halt, [401, "Invalid username or password"])
+      end
+    end
+
     get '/' do
       "Git LFS S3 is online."
     end
@@ -65,13 +72,6 @@ module GitLfsS3
         body MultiJson.dump({message: 'Object not found'})
       end
     end
-    
-    def protected!
-      unless authorized?
-        response['WWW-Authenticate'] = %(Basic realm="Restricted Area")
-        throw(:halt, [401, "Invalid username or password"])
-      end
-    end
 
     def public_read_grant
       grantee = Aws::S3::Types::Grantee.new(
@@ -93,7 +93,7 @@ module GitLfsS3
       status service.status
       body MultiJson.dump(service.response)
     end
-    
+
     post '/verify', provides: 'application/vnd.git-lfs+json' do
       data = MultiJson.load(request.body.tap { |b| b.rewind }.read)
       object = object_data(data['oid'])

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

@@ -8,12 +8,12 @@ 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]
+      secret_access_key = GitLfsS3::Application.settings.aws_secret_access_key
+      access_key_id = GitLfsS3::Application.settings.aws_access_key_id
+      endpoint = GitLfsS3::Application.settings.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)

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

@@ -1,3 +1,3 @@
 module GitLfsS3
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lsst-git-lfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk