pacproxy 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3640640110abb9f0a611723777390e1047433198
-  data.tar.gz: 98acc0fd1efc7786b7976d1dfea84207c5752fe8
+  metadata.gz: eda757cf693b406eb8f4502a3e85b2b0e326b95d
+  data.tar.gz: d8ed42f024dfebcccf979f4e05e5c2df8eb0d8ea
 SHA512:
-  metadata.gz: dec5acf4e26b12e0e7c9a0c8e4ad9e6a4993469af55a6c20d099f8995aa0cb09520e8aa9eadc68f86fa0ab23434f4fa72a146f99c819887892e7b28b213bdeac
-  data.tar.gz: 0e4579441de1e8399910eba31c323385600270048e1a3de4c3eebe6b2d09eb01d708b8b906a53f452033959b874d73e235cfa038f9156114c3ec48a7acaca581
+  metadata.gz: fb5e9a2dcfdbea5c337df0142e049081a9f718bdefe59ef3c62979aca90cf38c19ff9dd1c944858eb193c52a53818043046de28be0e8fa740297b2d13818e979
+  data.tar.gz: 706eb4bebce43f55c59572d1afb6f55c6292305adbafe3a3660bdee0cfe11546040805188c90ae25ce6784be925bbe0c72f52a2eff2c9b1f95b1a204e67ed14a

data/lib/pacproxy/pacproxy.rb

@@ -18,7 +18,27 @@ module Pacproxy
       return unless @pac
 
       proxy_line = @pac.find(request_uri(req))
-      lookup_proxy_uri(proxy_line)
+      proxy = lookup_proxy_uri(proxy_line)
+      create_proxy_uri(proxy, req.header)
+    end
+
+    def create_proxy_uri(proxy, header)
+      return nil unless proxy
+      return URI.parse("http://#{proxy}") unless
+        header.key?('proxy-authorization')
+
+      auth = header['proxy-authorization'][0]
+      pattern = /basic (\S+)/i
+      basic_auth = pattern.match(auth)[1]
+      header.delete('proxy-authorization')
+
+      return URI.parse("http://#{proxy}") unless basic_auth
+
+      URI.parse("http://#{basic_auth.unpack('m').first}@#{proxy}")
+    end
+
+    def proxy_auth(req, res)
+      @config[:ProxyAuthProc].call(req, res) if @config[:ProxyAuthProc]
     end
 
     private
@@ -37,8 +57,7 @@ module Pacproxy
         nil
       when /PROXY/
         primary_proxy = proxy_line.split(';')[0]
-        proxy = /PROXY (.*)/.match(primary_proxy)[1]
-        URI.parse("http://#{proxy}")
+        /PROXY (.*)/.match(primary_proxy)[1]
       end
     end
 

data/lib/pacproxy/version.rb

@@ -1,4 +1,4 @@
 # Pacproxy provides http/https proxy routed with proxy.pac.
 module Pacproxy
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/pacproxy.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["ota_h@nifty.com"]
   spec.summary       = %q{A proxy server works with proxy.pac}
   spec.description   = %q{A proxy server works with proxy.pac}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/otahi/pacproxy"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/spec/pacproxy_spec.rb

@@ -126,5 +126,25 @@ describe Pacproxy do
       res = c.get('http://127.0.0.1:13080/noproxy/')
       expect(res.status).to eq(200)
     end
+
+    it 'transfer request with auth to server via parent proxy' do
+      @pacproxy_server =
+        Pacproxy::Pacproxy.new(Port: 13_128,
+                               Proxypac: 'spec/all_proxy.pac')
+
+      Thread.new { @pacproxy_server.start }
+      wait_server_status(@pacproxy_server, :Running)
+
+      c = HTTPClient.new('http://127.0.0.1:13128')
+      header = { header: { 'proxy-authorization' =>
+          %Q(Basic #{['user01:pass01'].pack('m').delete("\n")})
+        }
+      }
+      p header: header
+      res = c.get('http://127.0.0.1:13080/', header)
+      expect(res.status).to eq(200)
+      res = c.get('http://127.0.0.1:13080/noproxy/', header)
+      expect(res.status).to eq(200)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacproxy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - OTA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pac
@@ -155,7 +155,7 @@ files:
 - spec/pacproxy_spec.rb
 - spec/partial_proxy.pac
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/otahi/pacproxy
 licenses:
 - MIT
 metadata: {}