git-lfs-s3 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4548ca444d7fc60b4f00896823b11b6385e43243
-  data.tar.gz: 986bcbcc585dfda6dd70656bed1e005bf519ac77
+  metadata.gz: acd25bb5ca03b072bd4daae629aa86ef3c388f1a
+  data.tar.gz: ad0841368e3fd4f5052030a7bf2079b09f2a6f43
 SHA512:
-  metadata.gz: 6d383ec8ef3ff7c0347e438650402e25db7141deb24e41de8b2684330ead5abd38d295a6784071d48a7a562ab9db7cff1e5544fbc446080da879783e907a4aee
-  data.tar.gz: 701233c012f4b11ff74494b8de0ffca43682eafed2f799bb38344939a42f1914219d5358423181410db2d60913be625fc28f12d57af985f45f9029f85be92cd6
+  metadata.gz: 7439c37cda896fd81507ab88144fccf885abb2f63fe0372d8150c31b8c42291b2a1f764688d9f1051078c786bfb940166d974e4b5ff4051adb4de50dafa0f6c1
+  data.tar.gz: 85d4af79803f6b18b32e21ed624fb7a4957cc60c6621834194b7d46fe36529d1c52d04c8ac8be9561bc32e1aa9a1302af5f57c22138959dba60d35a171827579

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-lfs-s3 (0.0.1)
+    git-lfs-s3 (0.1.0)
       aws-sdk (~> 2)
       multi_json
       sinatra

data/README.md

@@ -4,8 +4,6 @@ A [Git LFS](https://git-lfs.github.com/) server that stores your large Git files
 
 It works by generating a presigned URL that the Git LFS client can use to upload directly to S3. It also provides download URLs that allow Git clients to download directly from S3. No data is proxied through the Git LFS server.
 
-**Note:** the current version does not implement any authentication yet, so use with caution. Authentication will be added soon.
-
 ## Installation
 
 Git LFS S3 is available on RubyGems.
@@ -24,7 +22,7 @@ gem 'git-lfs-s3'
 
 ### Standalone
 
-All configuration is done via environment variables. All of the configuration variables must be set.
+All configuration is done via environment variables. All of these configuration variables must be set.
 
 * `AWS_REGION` - the region where your S3 bucket is.
 * `AWS_ACCESS_KEY_ID` - your AWS access key.
@@ -32,9 +30,29 @@ All configuration is done via environment variables. All of the configuration va
 * `S3_BUCKET` - the bucket you wish to use for LFS storage. While not required, I recommend using a dedicated bucket for this.
 * `LFS_SERVER_URL` - the URL where this server can be reached; needed to fetch download URLs.
 
+You can (and should) also set authentication information. When you push for the first time from git, you will be prompted to enter a username and password when authentication is enabled. You can configure these with environment variables as well.
+
+* `USERNAME` - the login username.
+* `PASSWORD` - the login password.
+
 ### Bundled
 
-If you are bundling the server inside of another application, such as Rails, you can set the configuration directly on `GitLfsS3::Application`. See [bin/git-lfs-s3](https://github.com/meltingice/git-lfs-s3/blob/master/bin/git-lfs-s3) for an example.
+If you are bundling the service inside of another application, such as Rails, or a different server of your choosing, you can set the configuration directly on `GitLfsS3::Application`. See [bin/git-lfs-s3](https://github.com/meltingice/git-lfs-s3/blob/master/bin/git-lfs-s3) for an example.
+
+You can also hook the authentication into your own service this way. For example:
+
+``` ruby
+GitLfsS3::Application.on_authenticate do |username, password|
+  user = User.find(username: username)
+  user.verify_password(password)
+end
+```
+
+The logger can be configured as well. This is especially handy if you want to hook it into your Rails logger:
+
+``` ruby
+GitLfsS3::Application.set :logger, Rails.logger
+```
 
 ### Git Setup
 
@@ -63,5 +81,4 @@ mount GitLfsS3::Application => '/lfs'
 
 ## TODO
 
-* Authentication
 * Cloudfront support

data/bin/git-lfs-s3

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require "rubygems"
+require "logger"
 require "git-lfs-s3"
 
 GitLfsS3::Application.set :aws_region, ENV['AWS_REGION']
@@ -8,6 +9,11 @@ GitLfsS3::Application.set :aws_access_key_id, ENV['AWS_ACCESS_KEY_ID']
 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 :logger, Logger.new(STDOUT)
+
+GitLfsS3::Application.on_authenticate do |username, password|
+  username == ENV['USERNAME'] && password == ENV['PASSWORD']
+end
 
 Rack::Handler::WEBrick.run(
   GitLfsS3::Application.new,

data/lib/git-lfs-s3.rb

@@ -1,8 +1,8 @@
-require 'logger'
 require 'sinatra/base'
 require 'aws-sdk'
 require 'multi_json'
 
 require "git-lfs-s3/aws"
+require "git-lfs-s3/authentication"
 require "git-lfs-s3/services/upload"
 require "git-lfs-s3/application"

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

@@ -2,31 +2,52 @@ module GitLfsS3
   class Application < Sinatra::Application
     include AwsHelpers
 
+    class << self
+      attr_reader :auth_callback
+
+      def on_authenticate(&block)
+        @auth_callback = block
+      end
+
+      def authentication_enabled?
+        !auth_callback.nil?
+      end
+
+      def perform_authentication(username, password)
+        auth_callback.call(username, password)
+      end
+    end
+
     configure do
       disable :sessions
       enable :logging
+    end
 
-      Dir.mkdir('logs') unless Dir.exists?('logs')
-      $logger = Logger.new("logs/#{settings.environment}.log", "weekly")
-      $logger.level = Logger::INFO
+    helpers do
+      def logger
+        settings.logger
+      end
     end
 
-    configure :development do
-      $logger.level = Logger::DEBUG
+    def authorized?
+      @auth ||=  Rack::Auth::Basic::Request.new(request.env)
+      @auth.provided? && @auth.basic? && @auth.credentials && self.class.auth_callback.call(
+        @auth.credentials[0], @auth.credentials[1]
+      )
     end
 
-    helpers do
-      def logger
-        $logger
+    def protected!
+      unless authorized?
+        response['WWW-Authenticate'] = %(Basic realm="Restricted Area")
+        throw(:halt, [401, "Invalid username or password"])
       end
     end
 
-    # before do
-    #   raise headers['Accept'].inspect
-    #   if headers['Accept'] != 'application/vnd.git-lfs+json'
-    #     halt 406, {'Content-Type' => 'text/plain'}, 'Server only accepts application/vnd.git-lfs+json'
-    #   end
-    # end
+    before { protected! }
+
+    get '/' do
+      "Git LFS S3 is online."
+    end
 
     get "/objects/:oid", provides: 'application/vnd.git-lfs+json' do
       object = object_data(params[:oid])
@@ -58,7 +79,6 @@ module GitLfsS3
       logger.debug headers.inspect
       service = UploadService.service_for(request.body)
       logger.debug service.response
-      logger.debug service.to_curl
       
       status service.status
       body MultiJson.dump(service.response)

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

@@ -23,17 +23,6 @@ module GitLfsS3
         202
       end
 
-      def to_curl
-        curl = ["curl -XPUT"]
-        curl << "-T \"{{file}}\""
-        upload_headers.each do |k, v|
-          curl << "-H \"#{k}: #{v}\""
-        end
-        curl << upload_destination
-
-        curl.join(' ')
-      end
-
       private
 
       def upload_destination

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

@@ -1,3 +1,3 @@
 module GitLfsS3
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-lfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan LeFevre