lsst-git-lfs-s3 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c281e6b4092827cee2ff392f15e5edfcd87e5a54
-  data.tar.gz: b17910a8176a51e1be82853e7cf68dde2f145abc
+  metadata.gz: 87a60c4fc9a10e630a5dd87eb4a47bdb9d9b02e3
+  data.tar.gz: d784db052f045fd9285c0e9521f03d0c8e3be558
 SHA512:
-  metadata.gz: ea4536a92be8d1a73173de01f92ac1efc0d95c08b6f035a8544902fca1895d76b1342bcd575f82cd8f49df0b5a079e852810d1e1aab0ca93c0f8c01dae268469
-  data.tar.gz: a20908659964e73b8452aba86ff4afe0a43181c3f9547dc6e587594cc40d6a4ffb967c27c87bbd1a0f7b7e0023a3315ab3aabc8642976fe6d94fab25d9dc8716
+  metadata.gz: 2d31f5b993a19bb8ffbeee5ba0e8ca481485984a8e52ef6adc56088100bdf520f58f09ff2c206af3465f381062a6976146a383e045eeab999a143193c26db85c
+  data.tar.gz: 02cdb618456dec8c3a57d792b6ba6e05bd0c682580642975cd37a2142076e0c0a836efaa9659b4bfb14a4cf2f08675d12a5a41f714bc59310cde4f287eec92d1

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

@@ -176,7 +176,9 @@ module GitLfsS3
       params = indifferent_params(JSON.parse(request.body.read))
       logger.debug params
       if params[:operation] == 'download'
-        lfs_resp(download(authenticated, params))
+        if settings.public_server
+          lfs_resp(download(authenticated, params))
+        end
       elsif params[:operation] == 'upload'
         if authenticated
           lfs_resp(upload(authenticated, params))
@@ -189,28 +191,30 @@ module GitLfsS3
     end
 
     get "/objects/:oid", provides: 'application/vnd.git-lfs+json' do
-      object = object_data(params[:oid])
-
-      if object.exists?
-        status 200
-        resp = {
-          'oid' => params[:oid],
-          'size' => object.size,
-          '_links' => {
-            'self' => {
-              'href' => File.join(settings.server_url, 'objects', params[:oid])
-            },
-            'download' => {
-              # TODO: cloudfront support
-              'href' => object_data(params[:oid]).presigned_url(:get)
+      if settings.public_server
+        object = object_data(params[:oid])
+        if object.exists?
+          status 200
+          resp = {
+            'oid' => params[:oid],
+            'size' => object.size,
+            '_links' => {
+              'self' => {
+                'href' => File.join(settings.server_url, 'objects', params[:oid])
+              },
+              'download' => {
+                'href' => object_data(params[:oid]).presigned_url(:get)
+              }
             }
           }
-        }
-
-        body MultiJson.dump(resp)
+          body MultiJson.dump(resp)
+        else
+          status 404
+          body MultiJson.dump({message: 'Object not found'})
+        end
       else
-        status 404
-        body MultiJson.dump({message: 'Object not found'})
+        status 401
+        body MultiJson.dump({message: 'Invalid username or password'})
       end
     end
 
@@ -221,33 +225,38 @@ module GitLfsS3
       Aws::S3::Types::Grant.new(grantee: grantee, permission: "READ")
     end
 
-    before do
-      pass if request.safe? and settings.public_server
-      protected!
-    end
-
     post "/objects", provides: 'application/vnd.git-lfs+json' do
-      logger.debug headers.inspect
-      service = UploadService.service_for(request.body)
-      logger.debug service.response
-      
-      status service.status
-      body MultiJson.dump(service.response)
+      if authorized?
+        logger.debug headers.inspect
+        service = UploadService.service_for(request.body)
+        logger.debug service.response
+        
+        status service.status
+        body MultiJson.dump(service.response)
+      else
+        status 401
+        body MultiJson.dump({message: 'Invalid username or password'})
+      end
     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'])
-      if not object.exists?
-        status 404
-      end
-      if settings.public_server and settings.ceph_s3
-        if not object.acl.grants.include?(public_read_grant)
-          object.acl.put(acl: "public-read")
+      if authorized?
+        data = MultiJson.load(request.body.tap { |b| b.rewind }.read)
+        object = object_data(data['oid'])
+        if not object.exists?
+          status 404
         end
-      end
-      if object.size == data['size']
-        status 200
+        if settings.public_server and settings.ceph_s3
+          if not object.acl.grants.include?(public_read_grant)
+            object.acl.put(acl: "public-read")
+          end
+        end
+        if object.size == data['size']
+          status 200
+        end
+      else
+        status 401
+        body MultiJson.dump({message: 'Invalid username or password'})
       end
     end
   end

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

@@ -1,3 +1,3 @@
 module GitLfsS3
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lsst-git-lfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk