mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib: Convert tabs to spaces for ruby files per
http://redmine.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style Patch by Steve Klabnik [Ruby 1.9 - Bug #4730] Patch by Jason Dew [Ruby 1.9 - Feature #4718] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain
parent
34276148c4
commit
7bbf2f3085
67 changed files with 3823 additions and 3814 deletions
160
lib/drb/ssl.rb
160
lib/drb/ssl.rb
|
|
@ -10,43 +10,43 @@ module DRb
|
|||
class SSLConfig
|
||||
|
||||
DEFAULT = {
|
||||
:SSLCertificate => nil,
|
||||
:SSLPrivateKey => nil,
|
||||
:SSLClientCA => nil,
|
||||
:SSLCACertificatePath => nil,
|
||||
:SSLCACertificateFile => nil,
|
||||
:SSLVerifyMode => ::OpenSSL::SSL::VERIFY_NONE,
|
||||
:SSLVerifyDepth => nil,
|
||||
:SSLVerifyCallback => nil, # custom verification
|
||||
:SSLCertificate => nil,
|
||||
:SSLPrivateKey => nil,
|
||||
:SSLClientCA => nil,
|
||||
:SSLCACertificatePath => nil,
|
||||
:SSLCACertificateFile => nil,
|
||||
:SSLVerifyMode => ::OpenSSL::SSL::VERIFY_NONE,
|
||||
:SSLVerifyDepth => nil,
|
||||
:SSLVerifyCallback => nil, # custom verification
|
||||
:SSLCertificateStore => nil,
|
||||
# Must specify if you use auto generated certificate.
|
||||
:SSLCertName => nil, # e.g. [["CN","fqdn.example.com"]]
|
||||
:SSLCertComment => "Generated by Ruby/OpenSSL"
|
||||
# Must specify if you use auto generated certificate.
|
||||
:SSLCertName => nil, # e.g. [["CN","fqdn.example.com"]]
|
||||
:SSLCertComment => "Generated by Ruby/OpenSSL"
|
||||
}
|
||||
|
||||
def initialize(config)
|
||||
@config = config
|
||||
@config = config
|
||||
@cert = config[:SSLCertificate]
|
||||
@pkey = config[:SSLPrivateKey]
|
||||
@ssl_ctx = nil
|
||||
end
|
||||
|
||||
def [](key);
|
||||
@config[key] || DEFAULT[key]
|
||||
@config[key] || DEFAULT[key]
|
||||
end
|
||||
|
||||
def connect(tcp)
|
||||
ssl = ::OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
|
||||
ssl.sync = true
|
||||
ssl.connect
|
||||
ssl
|
||||
ssl = ::OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
|
||||
ssl.sync = true
|
||||
ssl.connect
|
||||
ssl
|
||||
end
|
||||
|
||||
def accept(tcp)
|
||||
ssl = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
|
||||
ssl.sync = true
|
||||
ssl.accept
|
||||
ssl
|
||||
ssl = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
|
||||
ssl.sync = true
|
||||
ssl.accept
|
||||
ssl
|
||||
end
|
||||
|
||||
def setup_certificate
|
||||
|
|
@ -54,56 +54,56 @@ module DRb
|
|||
return
|
||||
end
|
||||
|
||||
rsa = OpenSSL::PKey::RSA.new(512){|p, n|
|
||||
next unless self[:verbose]
|
||||
case p
|
||||
when 0; $stderr.putc "." # BN_generate_prime
|
||||
when 1; $stderr.putc "+" # BN_generate_prime
|
||||
when 2; $stderr.putc "*" # searching good prime,
|
||||
# n = #of try,
|
||||
# but also data from BN_generate_prime
|
||||
when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
|
||||
# but also data from BN_generate_prime
|
||||
else; $stderr.putc "*" # BN_generate_prime
|
||||
end
|
||||
}
|
||||
rsa = OpenSSL::PKey::RSA.new(512){|p, n|
|
||||
next unless self[:verbose]
|
||||
case p
|
||||
when 0; $stderr.putc "." # BN_generate_prime
|
||||
when 1; $stderr.putc "+" # BN_generate_prime
|
||||
when 2; $stderr.putc "*" # searching good prime,
|
||||
# n = #of try,
|
||||
# but also data from BN_generate_prime
|
||||
when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
|
||||
# but also data from BN_generate_prime
|
||||
else; $stderr.putc "*" # BN_generate_prime
|
||||
end
|
||||
}
|
||||
|
||||
cert = OpenSSL::X509::Certificate.new
|
||||
cert.version = 3
|
||||
cert.serial = 0
|
||||
name = OpenSSL::X509::Name.new(self[:SSLCertName])
|
||||
cert.subject = name
|
||||
cert.issuer = name
|
||||
cert.not_before = Time.now
|
||||
cert.not_after = Time.now + (365*24*60*60)
|
||||
cert.public_key = rsa.public_key
|
||||
cert = OpenSSL::X509::Certificate.new
|
||||
cert.version = 3
|
||||
cert.serial = 0
|
||||
name = OpenSSL::X509::Name.new(self[:SSLCertName])
|
||||
cert.subject = name
|
||||
cert.issuer = name
|
||||
cert.not_before = Time.now
|
||||
cert.not_after = Time.now + (365*24*60*60)
|
||||
cert.public_key = rsa.public_key
|
||||
|
||||
ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
|
||||
cert.extensions = [
|
||||
ef.create_extension("basicConstraints","CA:FALSE"),
|
||||
ef.create_extension("subjectKeyIdentifier", "hash") ]
|
||||
ef.issuer_certificate = cert
|
||||
cert.add_extension(ef.create_extension("authorityKeyIdentifier",
|
||||
"keyid:always,issuer:always"))
|
||||
if comment = self[:SSLCertComment]
|
||||
cert.add_extension(ef.create_extension("nsComment", comment))
|
||||
end
|
||||
cert.sign(rsa, OpenSSL::Digest::SHA1.new)
|
||||
ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
|
||||
cert.extensions = [
|
||||
ef.create_extension("basicConstraints","CA:FALSE"),
|
||||
ef.create_extension("subjectKeyIdentifier", "hash") ]
|
||||
ef.issuer_certificate = cert
|
||||
cert.add_extension(ef.create_extension("authorityKeyIdentifier",
|
||||
"keyid:always,issuer:always"))
|
||||
if comment = self[:SSLCertComment]
|
||||
cert.add_extension(ef.create_extension("nsComment", comment))
|
||||
end
|
||||
cert.sign(rsa, OpenSSL::Digest::SHA1.new)
|
||||
|
||||
@cert = cert
|
||||
@pkey = rsa
|
||||
@cert = cert
|
||||
@pkey = rsa
|
||||
end
|
||||
|
||||
def setup_ssl_context
|
||||
ctx = ::OpenSSL::SSL::SSLContext.new
|
||||
ctx.cert = @cert
|
||||
ctx.key = @pkey
|
||||
ctx.client_ca = self[:SSLClientCA]
|
||||
ctx.ca_path = self[:SSLCACertificatePath]
|
||||
ctx.ca_file = self[:SSLCACertificateFile]
|
||||
ctx.verify_mode = self[:SSLVerifyMode]
|
||||
ctx.verify_depth = self[:SSLVerifyDepth]
|
||||
ctx.verify_callback = self[:SSLVerifyCallback]
|
||||
ctx.client_ca = self[:SSLClientCA]
|
||||
ctx.ca_path = self[:SSLCACertificatePath]
|
||||
ctx.ca_file = self[:SSLCACertificateFile]
|
||||
ctx.verify_mode = self[:SSLVerifyMode]
|
||||
ctx.verify_depth = self[:SSLVerifyDepth]
|
||||
ctx.verify_callback = self[:SSLVerifyCallback]
|
||||
ctx.cert_store = self[:SSLCertificateStore]
|
||||
@ssl_ctx = ctx
|
||||
end
|
||||
|
|
@ -111,13 +111,13 @@ module DRb
|
|||
|
||||
def self.parse_uri(uri)
|
||||
if uri =~ /^drbssl:\/\/(.*?):(\d+)(\?(.*))?$/
|
||||
host = $1
|
||||
port = $2.to_i
|
||||
option = $4
|
||||
[host, port, option]
|
||||
host = $1
|
||||
port = $2.to_i
|
||||
option = $4
|
||||
[host, port, option]
|
||||
else
|
||||
raise(DRbBadScheme, uri) unless uri =~ /^drbssl:/
|
||||
raise(DRbBadURI, 'can\'t parse uri:' + uri)
|
||||
raise(DRbBadScheme, uri) unless uri =~ /^drbssl:/
|
||||
raise(DRbBadURI, 'can\'t parse uri:' + uri)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ module DRb
|
|||
host = getservername
|
||||
soc = open_server_inaddr_any(host, port)
|
||||
else
|
||||
soc = TCPServer.open(host, port)
|
||||
soc = TCPServer.open(host, port)
|
||||
end
|
||||
port = soc.addr[1] if port == 0
|
||||
@uri = "drbssl://#{host}:#{port}"
|
||||
|
|
@ -164,24 +164,24 @@ module DRb
|
|||
|
||||
def close
|
||||
if @ssl
|
||||
@ssl.close
|
||||
@ssl = nil
|
||||
@ssl.close
|
||||
@ssl = nil
|
||||
end
|
||||
super
|
||||
end
|
||||
|
||||
def accept
|
||||
begin
|
||||
while true
|
||||
soc = @socket.accept
|
||||
break if (@acl ? @acl.allow_socket?(soc) : true)
|
||||
soc.close
|
||||
end
|
||||
ssl = @config.accept(soc)
|
||||
self.class.new(uri, ssl, @config, true)
|
||||
while true
|
||||
soc = @socket.accept
|
||||
break if (@acl ? @acl.allow_socket?(soc) : true)
|
||||
soc.close
|
||||
end
|
||||
ssl = @config.accept(soc)
|
||||
self.class.new(uri, ssl, @config, true)
|
||||
rescue OpenSSL::SSL::SSLError
|
||||
warn("#{__FILE__}:#{__LINE__}: warning: #{$!.message} (#{$!.class})") if @config[:verbose]
|
||||
retry
|
||||
warn("#{__FILE__}:#{__LINE__}: warning: #{$!.message} (#{$!.class})") if @config[:verbose]
|
||||
retry
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue