rex-random_identifier 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fad1c96eda18b0d8cd5490897e1934dd3fecfed
-  data.tar.gz: 8f50e783aa50603627411989c5ca81d46830bc82
+  metadata.gz: 99048e67578081a44d00b0c29e52a7ea2cf8467f
+  data.tar.gz: 5b3fb7836e4788bba6e7c4668eb648a154dcb074
 SHA512:
-  metadata.gz: e496290b730e277dcc0fdf66f37ba214c8a9682f9423afd96a010fe52ff8872c1891178061d3a6ada6ac2bcc2d15f1ae023225d5fc42576f2d0303cd27dc211a
-  data.tar.gz: 61e08bf5e70e678c17541f841df15ec04f8993e75433802ed1146f15acbc06f3b78353353bdb639cd455e5a875ccd98638c188d5dbc1524e8f45f170106bb1b3
+  metadata.gz: ed1935a0b2fc5bf1f42a4296f65bd30b7c4f5be71de13e15f35338cdcb8ef425f0554b5ca83fa5656ec75b49a18868145694800408509bd1bac229166c9bc90e
+  data.tar.gz: 0d58a54c2cc2d3bbffa180676df17f3fd7fa769e4c4411764a36e1243d27788fa21dabae03ae5d32a783aa1391f7567942ec927a37c7e11d8d3cc9914c2275cd

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-�NT��u�y�Ӄ����D��V�����\��9��s��z�����3:�b���9��Tq5B��@��`���a
-N�R��
-��<�y�U�k�eh���3�Qo���BX �'���`)9�f�M�A��N(��0��h���P\D4`
+/[����`sS�URv��6�����/O��M��j�J�>U�͞3*�as3~�em!j5ê(USA��u�[6���}����÷C:�(��Aa*bϖ���Լ lg:^�SJ�ş�P[��ل��4jt������s�:��Ӌ��œ�w�Ҕ��f�-E����X��o���S�'T��(
sGH��c�����V���_KgLxNXI��f“(�b4p�y	�5�P|%���.��NS�_���������cV

data/lib/rex/random_identifier/generator.rb

@@ -33,13 +33,15 @@ class Rex::RandomIdentifier::Generator
     :min_length => 3,
     # This should be pretty universal for identifier rules
     :char_set => Rex::Text::AlphaNumeric+"_",
-    :first_char_set => Rex::Text::LowerAlpha
+    :first_char_set => Rex::Text::LowerAlpha,
+    :forbidden => []
   }
 
   # @param opts [Hash] Options, see {DefaultOpts} for default values
   # @option opts :max_length [Fixnum]
   # @option opts :min_length [Fixnum]
   # @option opts :char_set [String]
+  # @option opts :forbidden [Array]
   def initialize(opts={})
     # Holds all identifiers.
     @value_by_name = {}
@@ -82,10 +84,10 @@ class Rex::RandomIdentifier::Generator
   #   identifier. This is what you would normally call the variable if
   #   you weren't generating it.
   # @return [String]
-  def get(name)
+  def get(name, len = nil)
     return @value_by_name[name] if @value_by_name[name]
 
-    @value_by_name[name] = generate
+    @value_by_name[name] = generate(len)
     @name_by_value[@value_by_name[name]] = name
 
     @value_by_name[name]
@@ -150,7 +152,7 @@ class Rex::RandomIdentifier::Generator
   # @return [String] A string that matches <tt>[a-z][a-zA-Z0-9_]*</tt>
   # @yield [String] The identifier before uniqueness checks. This allows
   #   you to modify the value and still avoid collisions.
-  def generate(len=nil)
+  def generate(len = nil)
     raise ArgumentError, "len must be positive integer" if len && len < 1
     raise ExhaustedSpaceError if @value_by_name.length >= @max_permutations
 
@@ -169,10 +171,20 @@ class Rex::RandomIdentifier::Generator
       end
       # Try to make another one if it collides with a previously
       # generated one.
-      break unless @name_by_value.key?(ident)
+      break unless @name_by_value.key?(ident) or forbid_id?(ident)
     end
 
     ident
   end
 
+  #
+  # Check if an identifier is forbidden
+  #
+  # @param str [String] String for which to check permissions
+  #
+  # @return [Boolean] Is identifier forbidden?
+  def forbid_id?(ident = nil)
+    ident.nil? or @opts[:forbidden].any? {|f| f.match(/^#{ident}$/i) }
+  end
+
 end

data/lib/rex/random_identifier/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module RandomIdentifier
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/rex-random_identifier.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.2.0'
+
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-random_identifier
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - David 'thelightcosine' Maloney
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Random Identifier Generator

metadata.gz.sig

@@ -1,3 +1,2 @@
-XݪMf1��چ^g�r�$Q�汩�\�/'�H9��_+9�:���gC �	ӆ�z��[�-l¸zϷ�c.�,d�'B��
-'@唏RV`���.�$j����d�G{�95�)�+^���!�R���B�~*�hW�c#M��&�baN�p
-'��$��m
+CZI��	}�ר.P�YM�)�Y\�a�y���9��9�@�
�ۅ�+�?����i�I�20����NK3�u�Rj������
eْ������1�C�c͗;3�&M!W�!5�������������E*gI)�f�A�ì���Z��3m "~��(�3h���
+Y|c"\�ݨf���܀N{+�O���G�~�Ѳ�k3ma"+��r���m"�Sv'��-SGȵ�����cR�(S�����Y��U*Be�ܿe