siteguard_lite-custom_signature 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2afd93f858fa218143f84c0f9f17d1193240151c01143e957eb486441072b415
-  data.tar.gz: 29790f84d51e9781f1d50c1dda38b37475b7a0d568e5690b04ecd73f4b5261cd
+  metadata.gz: 123971b24064f124e88b1636b2ec2be1f0a9209ff86e9caa1f7e3e1800bbcfa7
+  data.tar.gz: dceefee584c5b09f79eb90b918d2094d3ac1682d2c68e6503c3c2973c8cdbde1
 SHA512:
-  metadata.gz: 29d812d5abbc1935b228a3bc1035359302ff1a07314e52d2fc5dd750fac7a6fe6331426b32feccae819eead5383bd146ef803eef0eca8d56d2f107cbf0d8c332
-  data.tar.gz: b9d2fccf098915d39214cbed4293f58503d7b328c58b1a55ec01152cda27f682a1004854bd29214dad911c3f5012485712cf4e31d6bea9a754f1f6d7a0c88bf4
+  metadata.gz: 146c2bae738d1a9c1b6f65a3a921c7e47f1a99439dd460a1eddd14dcf3e5b51ac2e74b80b3ded8df0c22ea7c660552cba17b083d8e374e0df839257a9ac11eab
+  data.tar.gz: 9722d622d5ba590d9eb6e58764be52e18fd0a3e4213df4b0769ded720a3c653a5c784213cacded71dbc463483948d7f92674d18b56ddbb87ac4dc667010e1a9d

data/.github/workflows/ruby.yml

@@ -0,0 +1,26 @@
+name: Ruby
+
+on: 
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7']
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - run: bin/setup
+
+      - run: bundle exec rake spec

data/lib/siteguard_lite/custom_signature/condition.rb

@@ -17,10 +17,9 @@ module SiteguardLite
       # [有効・無効]<タブ>[動作]<タブ><タブ>[シグネチャ名]<タブ>[検査対象] <タブ>[比較方法]<タブ> [検査文字列]<タブ><タブ>[コメント]
       def to_text(rule, last: false)
         validate!
-
         [
           rule.enable_str,
-          rule.action,
+          rule.action_str,
           '',
           rule.name,
           @key,

data/lib/siteguard_lite/custom_signature/rule.rb

@@ -3,12 +3,13 @@ module SiteguardLite
     class Rule
       include ActiveModel::Validations
 
-      attr_reader :name, :action, :comment, :enable, :conditions
-      attr_accessor :exclusion_action, :signature
+      attr_reader :name, :comment, :enable, :conditions, :filter_lifetime
+      attr_accessor :action, :exclusion_action, :signature
 
       validates :name, bytesize: { maximum: 29 }
       validates :signature, bytesize: { maximum: 999 }
-      validates :action, inclusion: %w(BLOCK NONE WHITE) # TODO support FILTER action
+      validates :filter_lifetime, format: { with: /\A\d+\z/ }, allow_nil: true
+      validates :action, inclusion: %w(BLOCK NONE WHITE FILTER)
 
       def initialize(args)
         @name = args[:name]
@@ -17,6 +18,12 @@ module SiteguardLite
         @signature = args[:signature]
         @action = args[:action] || 'NONE'
 
+        if @action == 'FILTER'
+          @filter_lifetime = args[:filter_lifetime] || '300'
+        else
+          @filter_lifetime = nil
+        end
+
         @enable = true
 
         @conditions = []
@@ -30,6 +37,10 @@ module SiteguardLite
         @enable ? 'ON' : 'OFF'
       end
 
+      def action_str
+        @action == 'FILTER' ? "#{@action}:#{@filter_lifetime}" : @action
+      end
+
       def to_text
         validate!
 
@@ -45,6 +56,7 @@ module SiteguardLite
         {
           name: @name,
           action: @action,
+          filter_lifetime: @filter_lifetime,
           comment: @comment,
           exclusion_action: @exclusion_action,
           signature: @signature,

data/lib/siteguard_lite/custom_signature/text_line_parser.rb

@@ -1,13 +1,16 @@
 module SiteguardLite
   module CustomSignature
     class TextLineParser
+      FILTER_ACTION_REGEX = /\AFILTER:(\d+)\z/
+
       # siteguardlite-320-0_nginx.pdf, p.52
       # [有効・無効]<タブ>[動作]<タブ><タブ>[シグネチャ名]<タブ>[検査対象] <タブ>[比較方法]<タブ> [検査文字列]<タブ><タブ>[コメント]
       def parse(line)
         fields = line.split("\t")
         {
           enable: enable(fields[0]),
-          action: fields[1],
+          action: parse_action(fields[1]),
+          filter_lifetime: parse_filter_lifetime(fields[1]),
           name: fields[3],
           comment: fields[8],
           exclusion_action: exclusion_action(fields[5]),
@@ -60,6 +63,19 @@ module SiteguardLite
 
         @parsed_comarison_str = result
       end
+
+      def parse_action(parsed_action)
+        case parsed_action
+        when FILTER_ACTION_REGEX
+          'FILTER'
+        else
+          parsed_action
+        end
+      end
+
+      def parse_filter_lifetime(parsed_action)
+        parsed_action =~ FILTER_ACTION_REGEX ? $1 : nil
+      end
     end
   end
 end

data/lib/siteguard_lite/custom_signature/text_loader.rb

@@ -23,6 +23,7 @@ module SiteguardLite
             rule = Rule.new(
               enable: parsed[:enable],
               action: parsed[:action],
+              filter_lifetime: parsed[:filter_lifetime],
               name: parsed[:name],
               comment: parsed[:comment],
               exclusion_action: parsed[:exclusion_action],

data/lib/siteguard_lite/custom_signature/version.rb

@@ -1,5 +1,5 @@
 module SiteguardLite
   module CustomSignature
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/siteguard_lite/custom_signature/yaml_loader.rb

@@ -8,6 +8,7 @@ module SiteguardLite
           rule = SiteguardLite::CustomSignature::Rule.new(
             name: r['name'],
             action: r['action'],
+            filter_lifetime: r['filter_lifetime'],
             comment: r['comment'],
             exclusion_action: r['exclusion_action'],
             signature: r['signature']

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

data/siteguard_lite-custom_signature.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activemodel"
   spec.add_dependency "activesupport"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siteguard_lite-custom_signature
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Takatoshi Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -42,44 +42,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: This library load and dump SiteGuard Lite custom signature file.
 email:
 - takatoshi.ono@gmail.com
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -106,6 +106,7 @@ files:
 - lib/siteguard_lite/custom_signature/version.rb
 - lib/siteguard_lite/custom_signature/yaml_dumper.rb
 - lib/siteguard_lite/custom_signature/yaml_loader.rb
+- renovate.json
 - siteguard_lite-custom_signature.gemspec
 homepage: https://github.com/pepabo/siteguard_lite-custom_signature
 licenses:
@@ -126,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This library load and dump SiteGuard Lite custom signature file.

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.16.1