rex-random_identifier 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c9571d3505cd046a46dd18a365270c8cac23425efd11982b1f13a4b5c7ccda5
-  data.tar.gz: e576c1de9555bf1cdc8bbe1a3e62ede10df0fbccdfc8def25d6ffc58eedb647a
+  metadata.gz: dc766a219e863de2022c92549cec5cfb8c4fefb31104732db068d74d35d5f044
+  data.tar.gz: 8f20d3c2c51ee34942a1f7508e81922ab953d9737c6e12979fe146678975ae6b
 SHA512:
-  metadata.gz: 352a8c6c761fff3603895df1e681b4c4160443d4f377b5955c74466a17c178bafd5ed7159bec66d6359915dee5dd08b397c2bd4ff665d6fbb7d63b91836b1ee7
-  data.tar.gz: d79da21e1917a9938e429e818e4bfea57a408de2475bf2ad216d4afe4ac1325f84896f0de1a47bfaebd5eed562204e050e9c38a9614d769383be9bfd370c2a39
+  metadata.gz: 7cde61ecaac3b17d8be104b164fde79c88707f76b48e214bf8c4475ecf659a20c8427253fe1d83acb60c8d019d22020098c632ed8a999a48fc09900cb39ca58d
+  data.tar.gz: 33006a14e765085e7d9a2a48bb901f11a6954a3d329fa93ef55389c9610d981e1427d657726b0043c6be85e9645399265f983dbc9528eacf4c6da91691c8ea9e

data/lib/rex/random_identifier/generator.rb

@@ -34,10 +34,42 @@ class Rex::RandomIdentifier::Generator
     # This should be pretty universal for identifier rules
     :char_set => Rex::Text::AlphaNumeric+"_",
     :first_char_set => Rex::Text::LowerAlpha,
-    :forbidden => []
+    :forbidden => [].freeze
+  }
+
+  JavaOpts = DefaultOpts.merge(
+    forbidden: (
+      DefaultOpts[:forbidden] +
+      %w[
+        abstract assert boolean break byte case catch char class const
+        continue default do double else enum extends false final finally
+        float for goto if implements import instanceof int interface long
+        native new null package private protected public return short
+        static strictfp super switch synchronized this throw throws
+        transient true try void volatile while _
+      ]
+    ).uniq.freeze
+  )
+
+  JSPOpts = JavaOpts.merge(
+    forbidden: (
+      JavaOpts[:forbidden] +
+      # Reserved Words for Implicit Objects
+      # https://docs.oracle.com/cd/E13222_01/wls/docs90/webapp/reference.html#66991
+      %w[
+        application config out page pageContext request response session var
+      ]
+    ).uniq.freeze
+  )
+
+  Opts = {
+    default: DefaultOpts,
+    java: JavaOpts,
+    jsp: JSPOpts
   }
 
   # @param opts [Hash] Options, see {DefaultOpts} for default values
+  # @option opts :language [Symbol] See the {Opts} keys for supported languages
   # @option opts :max_length [Fixnum]
   # @option opts :min_length [Fixnum]
   # @option opts :char_set [String]
@@ -49,7 +81,12 @@ class Rex::RandomIdentifier::Generator
     # having to search through the whole list of values
     @name_by_value = {}
 
-    @opts = DefaultOpts.merge(opts)
+    language = opts[:language] || :default
+    unless Opts.has_key?(language)
+      raise ArgumentError, "Language option #{language} is not supported. Expected one of #{Opts.keys}"
+    end
+    @opts = Opts[language]
+    @opts = @opts.merge(opts)
     if @opts[:min_length] < 1 || @opts[:max_length] < 1 || @opts[:max_length] < @opts[:min_length]
       raise ArgumentError, "Invalid length options"
     end

data/lib/rex/random_identifier/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module RandomIdentifier
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-random_identifier
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.sig

@@ -1,2 +1 @@
-ƌ@ꤹ�e����_���Ç��^��aeX��Bw��ٰ�.�
-ՊZR�-��[��{B߳]o����j�!ؕm賿��o�Z'�%KG���~���0�
P��W|�b.Hj�pTd�j�2[x$��m(�1�;9�G�l����K�1*�lS����$�������u�����y3�־wh��ϯ�[�3ٛ&�
+)�ԓ����o����u����ő�j����� S�ԍp������ ���hEӊ{�W