Attachment 148098 Details for Bug 194244 – update to 1.6.1

[patch] update to 1.6.1

foreman-proxy-1.6.1.diff (text/plain), 4.26 KB, created by Michael Moll on 2014-10-08 14:24:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Moll

Created: 2014-10-08 14:24:50 UTC

Size: 4.26 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 370442)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	foreman-proxy
>-PORTVERSION=	1.6.0
>+PORTVERSION=	1.6.1
> CATEGORIES=	net
> MASTER_SITES=	GH
> 
>@@ -24,7 +24,7 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	theforeman
> GH_PROJECT=	smart-proxy
>-GH_COMMIT= 	0330140
>+GH_COMMIT= 	4012d48
> USE_RUBY=	yes
> USE_RAKE=	yes
> USE_RC_SUBR=	foreman-proxy
>Index: distinfo
>===================================================================
>--- distinfo	(revision 370442)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (foreman-proxy-1.6.0.tar.gz) = 0f3fc7da8794afe9c5d86807e064fd1dd8864ef5c16ff893411794cb62dc437f
>-SIZE (foreman-proxy-1.6.0.tar.gz) = 106572
>+SHA256 (foreman-proxy-1.6.1.tar.gz) = bef4f230f3890dfeea6414906e23112e8688d20a2aeee999382e6f33c36cd359
>+SIZE (foreman-proxy-1.6.1.tar.gz) = 107144
>Index: files/patch-52f0bacf26923826a9b112369d504972369b3cf0
>===================================================================
>--- files/patch-52f0bacf26923826a9b112369d504972369b3cf0	(revision 0)
>+++ files/patch-52f0bacf26923826a9b112369d504972369b3cf0	(working copy)
>@@ -0,0 +1,87 @@
>+diff --git lib/sinatra/ssl_client_verification.rb lib/sinatra/ssl_client_verification.rb
>+new file mode 100644
>+index 0000000..8000de9
>+--- /dev/null
>++++ lib/sinatra/ssl_client_verification.rb
>+@@ -0,0 +1,13 @@
>++require 'sinatra/base'
>++
>++::Sinatra::Base.helpers ::Proxy::Helpers
>++::Sinatra::Base.helpers ::Proxy::Log
>++::Sinatra::Base.before do
>++  if ['yes', 'on', '1'].include? request.env['HTTPS'].to_s
>++    if request.env['SSL_CLIENT_CERT'].to_s.empty?
>++      log_halt 403, "No client SSL certificate supplied"
>++    end
>++  else
>++    logger.debug('require_ssl_client_verification: skipping, non-HTTPS request')
>++  end
>++end
>+diff --git lib/smart_proxy.rb lib/smart_proxy.rb
>+index 384e38c..56231a7 100644
>+--- lib/smart_proxy.rb
>++++ lib/smart_proxy.rb
>+@@ -24,6 +24,7 @@
>+ 
>+ require 'rack-patch' if Rack.release < "1.3"
>+ require 'sinatra-patch'
>++require 'sinatra/ssl_client_verification'
>+ require 'sinatra/trusted_hosts'
>+ 
>+ module Proxy
>+diff --git lib/smart_proxy_for_testing.rb lib/smart_proxy_for_testing.rb
>+index 16cdcbe..b089f20 100644
>+--- lib/smart_proxy_for_testing.rb
>++++ lib/smart_proxy_for_testing.rb
>+@@ -11,6 +11,7 @@
>+ require 'proxy/error'
>+ 
>+ require 'sinatra/base'
>++require 'sinatra/ssl_client_verification'
>+ require 'sinatra/trusted_hosts'
>+ 
>+ Proxy::SETTINGS = ::Proxy::Settings::Global.new(:log_file => './logs/test.log', :log_level => 'DEBUG')
>+diff --git test/sinatra/ssl_client_verification_test.rb test/sinatra/ssl_client_verification_test.rb
>+new file mode 100644
>+index 0000000..3e2c79b
>+--- /dev/null
>++++ test/sinatra/ssl_client_verification_test.rb
>+@@ -0,0 +1,38 @@
>++require 'test_helper'
>++require 'json'
>++require 'sinatra/base'
>++
>++ENV['RACK_ENV'] = 'test'
>++
>++class SSLClientVerificationTest < Test::Unit::TestCase
>++  include Rack::Test::Methods
>++
>++  def app
>++    TestApp.new
>++  end
>++
>++  def test_http
>++    get '/test'
>++    assert last_response.ok?
>++  end
>++
>++  ['yes', 'on', '1'].each do |yes|
>++    define_method("test_https_no_cert_https_#{yes}") do
>++      get '/test', {}, {'HTTPS' => yes}
>++      assert last_response.forbidden?
>++    end
>++  end
>++
>++  def test_https_cert
>++    get '/test', {}, {'HTTPS' => 'on', 'SSL_CLIENT_CERT' => '...'}
>++    assert last_response.ok?
>++  end
>++
>++  private
>++
>++  class TestApp < ::Sinatra::Base
>++    get '/test' do
>++      'success'
>++    end
>++  end
>++end
>
>Property changes on: files/patch-52f0bacf26923826a9b112369d504972369b3cf0
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 370442)
>+++ pkg-plist	(working copy)
>@@ -44,6 +44,7 @@
> %%DATADIR%%/lib/proxy/virsh.rb
> %%DATADIR%%/lib/proxy.rb
> %%DATADIR%%/lib/rack-patch.rb
>+%%DATADIR%%/lib/sinatra/ssl_client_verification.rb
> %%DATADIR%%/lib/sinatra/trusted_hosts.rb
> %%DATADIR%%/lib/sinatra-patch.rb
> %%DATADIR%%/lib/smart_proxy.rb

Actions: View | Diff

Attachments on bug 194244: 148098 | 148133