rex-random_identifier 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c9571d3505cd046a46dd18a365270c8cac23425efd11982b1f13a4b5c7ccda5
-  data.tar.gz: e576c1de9555bf1cdc8bbe1a3e62ede10df0fbccdfc8def25d6ffc58eedb647a
+  metadata.gz: 5bebd9aaae44f450ed7fce4a510496c03ad9dd3ae817a53c0a971bee7d053231
+  data.tar.gz: d4f25e635ea34259fadcee150dedc3b76d86f5e3cf3278687d9941751773bc3e
 SHA512:
-  metadata.gz: 352a8c6c761fff3603895df1e681b4c4160443d4f377b5955c74466a17c178bafd5ed7159bec66d6359915dee5dd08b397c2bd4ff665d6fbb7d63b91836b1ee7
-  data.tar.gz: d79da21e1917a9938e429e818e4bfea57a408de2475bf2ad216d4afe4ac1325f84896f0de1a47bfaebd5eed562204e050e9c38a9614d769383be9bfd370c2a39
+  metadata.gz: 1369b96dec5266f98ff8441ff51e715787217886d1b2847ca821cd42a188e2ed74448b1393444c3747667ee513400cb6df62435044450a01d16aca734378ace6
+  data.tar.gz: 4455996738dfd4498fe184c0de0ca6dee9287d2557a53f11b65c6991fd1f68aa0ddd0e60215d9f1eb6aadca412d2db2709eb9dddb07ca121dc01cb667fcf9bd5

checksums.yaml.gz.sig

@@ -1,2 +1 @@
->)s~3x�d���]�5��'3���i?���]j�IQV5��]��2,��a.�M��T��Y��K��
-��@ �;Z;��.8r��Dɔ��K�I:�H�)bGL.1��3ܤ@a���WX̀klS�%Ymzjt�s�`F��2z�O�Z䗾�{��<L7�ZOX�ɻ,�䁗�4m��]
l	<������|�O\��S����w|�$Z�ެŧn�����|U�0�XmC�~X�+�n�0L�xK2�0@
+|��+��#NA��#n
��LHN�ʅ�N2���
�4����J���ɬ� �;'U��'j��•pC�!v�3����jK�:w�Y��Q�-��"�L7�sf��\��V_P�j�����fW��}��<�$�����~i_W���===�+K7����g�d�N�������ωql�*:���i��x�KK%���c��ш�pa�0D.U.�[��xP#��rwj��I>��uy�[u�X�]�V��z��$~1�

data/.github/workflows/verify.yml

@@ -10,45 +10,39 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 40
 
     strategy:
       fail-fast: true
       matrix:
         ruby:
-          - 2.5
-          - 2.6
           - 2.7
           - 3.0
+          - 3.1
+        os:
+          - ubuntu-20.04
+          - ubuntu-latest
+        exclude:
+          - { os: ubuntu-latest, ruby: 2.7 }
+          - { os: ubuntu-latest, ruby: 3.0 }
         test_cmd:
           - bundle exec rspec
 
     env:
       RAILS_ENV: test
 
-    name: Ruby ${{ matrix.ruby }} - ${{ matrix.test_cmd }}
+    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }} - ${{ matrix.test_cmd }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - uses: actions/setup-ruby@v1
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
-      - name: Setup bundler
-        run: |
-          gem install bundler
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
       - name: ${{ matrix.test_cmd }}
         run: |
           echo "${CMD}"

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.9"
   end
 end

data.tar.gz.sig

@@ -1,3 +1,2 @@
-,�
-Pĝvly�#�� f�=�:&���˭�!���MЫ_���4�:�׬~��?F*M�r/<�!;��;�H��$v\����T����$�����z�{�����5�h�ܿ�����wҕ7	�m�&�>��d�5b�Am|O?��x
-�:ꈹ�*�_���b��{�in��[����-�kĠ('����v�&x35:��~���X��p4j�� �ec�]����W C�Ը
+�IN�zav|����x�鈑	dυ��a�
++v�

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.9
 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: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake