rex-socket 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24fd1f504f256379c0d5d2edd6784c3023f56f03
-  data.tar.gz: f173a85b8a8fcb821f45be200c8a1704caeeca77
+  metadata.gz: 5dd18788e55337f4c64c6a2b5bdc221b897a4ca9
+  data.tar.gz: 4b7d5ec7e28ea4cfecd8e3eeff2bb3fafd116882
 SHA512:
-  metadata.gz: d3c3e16ee50aa43e3d96c6f41bb9b41541b24160839890dd1edb842e32e264141102be75d02778491593f830c2fb3e1a2af8485e5f68a81178758b9e2840374e
-  data.tar.gz: 7d09132d390ff1cccaf0c66b485239d059a7959c0e68e2553b48305b7a02b8546fc2afbcc734d436bd67bd22046a115ea61ace6a710f15ed4539bcb8fc116d1f
+  metadata.gz: 9f8e493f4349b58068e7c33e1e5b116290ddd35b96f6eda50dc7577c61fb845999730e398c359773a5ddf05628a387ef41b9eb3f2ebd0f69da8c12d90e007c1c
+  data.tar.gz: 5532feff68e43c54f1c32318bae095097a1e9fd1b2d243e8f5582a8972f10a326221a69551781f7aad62ec9600e98e437a1e2eba5ff1d07978f25879196355d5

data/lib/rex/socket/parameters.rb

@@ -140,6 +140,14 @@ class Rex::Socket::Parameters
       self.ssl_cipher = hash['SSLCipher']
     end
 
+    if (hash['VHOST'])
+      self.ssl_cn = hash['VHOST']
+    end
+
+    if (hash['SSLCommonName'])
+      self.ssl_cn = hash['SSLCommonName']
+    end
+
     if (hash['SSLCert'] and ::File.file?(hash['SSLCert']))
       begin
         self.ssl_cert = ::File.read(hash['SSLCert'])
@@ -359,6 +367,10 @@ class Rex::Socket::Parameters
   # @return [String,Array]
   attr_accessor :ssl_cipher
 
+  # Which Common Name to use for certificate
+  # @return [String}
+  attr_accessor :ssl_cn
+
   # The SSL certificate, in pem format, stored as a string.  See
   # {Rex::Socket::SslTcpServer#makessl}
   # @return [String]

data/lib/rex/socket/ssl.rb

@@ -13,12 +13,10 @@ module Rex::Socket::Ssl
 
   module CertProvider
 
-    def self.ssl_generate_subject
+    def self.ssl_generate_subject(cn = Rex::Text.rand_hostname, org = Rex::Text.rand_name)
       st  = Rex::Text.rand_state
       loc = Rex::Text.rand_name.capitalize
-      org = Rex::Text.rand_name.capitalize
-      cn  = Rex::Text.rand_hostname
-      "/C=US/ST=#{st}/L=#{loc}/O=#{org}/CN=#{cn}"
+      "/C=US/ST=#{st}/L=#{loc}/O=#{org.capitalize}/CN=#{cn}"
     end
 
     def self.ssl_generate_issuer
@@ -32,11 +30,11 @@ module Rex::Socket::Ssl
     # certificate. This matches a typical "snakeoil" cert.
     #
     # @return [String, String, Array]
-    def self.ssl_generate_certificate
+    def self.ssl_generate_certificate(cn = Rex::Text.rand_hostname, org = Rex::Text.rand_name)
       yr      = 24*3600*365
       vf      = Time.at(Time.now.to_i - rand(yr * 3) - yr)
       vt      = Time.at(vf.to_i + (rand(9)+1) * yr)
-      subject = ssl_generate_subject
+      subject = ssl_generate_subject(cn, org)
       issuer  = ssl_generate_issuer
       key     = OpenSSL::PKey::RSA.new(2048){ }
       cert    = OpenSSL::X509::Certificate.new
@@ -119,7 +117,7 @@ module Rex::Socket::Ssl
     if params.ssl_cert
       key, cert, chain = ssl_parse_pem(params.ssl_cert)
     else
-      key, cert, chain = ssl_generate_certificate
+      key, cert, chain = ssl_generate_certificate(params.ssl_cn)
     end
 
     ctx = OpenSSL::SSL::SSLContext.new()

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.17"
+    VERSION = "0.1.18"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - David Maloney
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler