censor_bear 0.1.10 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0727b29e168a3f9a2fc4abb8979db9979bbfaf351e88738585bd667b3be7856a
-  data.tar.gz: 1d2c67774a6d20a4ad0b907c43115ea0cedfdb6410cbad16b60addc4a4a6ec2d
+  metadata.gz: e8f5e80bfe3be4dc22e9c8fc14932f6c830a87efc0ee15d5588bd258f0311e0e
+  data.tar.gz: bc47827fb4f09f2cd875d20db1c4593168917709b0174d0780237c503c156e5e
 SHA512:
-  metadata.gz: 93b0e0d47cfe57651d59aa23689c54de9003f3ef1494545834f0c4708f95fafc50abd4f68906d96a73320f5e45d6d5bb846b8f316e1d27abfcd2701b3f0c0ea8
-  data.tar.gz: 3c9e731f73a57075cf9ea868d75c9d707a2be4ba6666a7671d20b0306a169dc2d9e616e64670d614d4ceb72dc08719196cc97e35779ee555430f72879cf71899
+  metadata.gz: fc58e6353da8c5697b92f2c4857a7dcaa948a6e03c367d14aed8960b015c0809cc33094628efc1983f07865f270ae646bbf05c942dda7a58b425db54f3434f00
+  data.tar.gz: d080b530b575ece289451d58079a40e3a85ad0f7721e8707cac299d141ea066047f5b36c13a9a5a7a133edf0e70707d28b85ea622ea4fe20f5309cc5be132462

data/app/assets/stylesheets/censor_bear/home.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/censor_bear/home_controller.rb

@@ -0,0 +1,31 @@
+require_dependency 'censor_bear/application_controller'
+
+module CensorBear
+  class HomeController < ApplicationController
+    def index; end
+
+    def debugger; end
+
+    def debug
+      content = params[:content]
+      type = params[:type]
+
+      case params[:stage]
+      when 'aliyun_check'
+        @r = AliyunGreen::Text.scan(content)
+      when 'check_text'
+        @r = CensorBear.check_text(content, type.to_sym)
+      when 'check_search'
+        # TODO: 搜索前置检查
+        @r = {}
+      when 'check_image'
+        # TODO: 检查图片
+        @r = {}
+      when 'qq_regex'
+        @r = content.match(Censor::QQ_REG)
+      when 'wx_regex'
+        @r = content.match(Censor::WX_REG)
+      end
+    end
+  end
+end

data/app/controllers/censor_bear/logs_controller.rb

@@ -55,6 +55,7 @@ module CensorBear
     def load_logs
       builder ||= log_scope
       builder = builder.where("original_content ilike ?", "%#{params[:q]}%") if params[:q].present?
+      builder = builder.where(stage: params[:stage]) if params[:stage].present?
       builder = builder.order(id: :desc)
 
       @pagy, @logs = pagy(builder)

data/app/controllers/censor_bear/mod_logs_controller.rb

@@ -79,7 +79,7 @@ module CensorBear
     end
 
     def load_mod_logs
-      builder ||= mod_log_scope
+      builder ||= mod_log_scope.includes(:record)
       builder = builder.where("content ilike ?", "%#{params[:q]}%") if params[:q].present?
 
       builder = builder.order(id: :desc)

data/app/controllers/censor_bear/stop_words_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "censor_bear/application_controller"
+require_dependency 'censor_bear/application_controller'
 
 module CensorBear
   class StopWordsController < ApplicationController
@@ -46,7 +46,16 @@ module CensorBear
 
     def load_stop_words
       builder ||= stop_word_scope
-      builder = builder.where("key ilike ?", "%#{params[:q]}%") if params[:q].present?
+      builder = builder.where('key ilike ?', "%#{params[:q]}%") if params[:q].present?
+      case params[:filter]
+      when 'size_one'
+        builder = builder.where('length(key) = 1')
+      when 'size_two'
+        builder = builder.where('length(key) = 2')
+      when 'size_three'
+        builder = builder.where('length(key) = 3')
+      end
+      builder = builder.where('key ilike ?', "%#{params[:q]}%")
       builder = builder.order(id: :desc)
 
       @pagy, @stop_words = pagy(builder)

data/app/helpers/censor_bear/home_helper.rb

@@ -0,0 +1,4 @@
+module CensorBear
+  module HomeHelper
+  end
+end

data/app/models/censor_bear/log.rb

@@ -1,5 +1,23 @@
 module CensorBear
   class Log < ApplicationRecord
     belongs_to :user, class_name: CensorBear.config.user_class, optional: true
+
+    def suggestion
+      return nil if response.blank?
+
+      response['data']&.first['results']&.first['suggestion']
+    end
+
+    def rate
+      return nil if response.blank?
+
+      response['data']&.first['results']&.first['rate']
+    end
+
+    def label
+      return nil if response.blank?
+
+      response['data']&.first['results']&.first['label']
+    end
   end
 end

data/app/models/censor_bear/mod_log.rb

@@ -10,6 +10,8 @@ module CensorBear
     end
 
     def delete(reason)
+      return if record.blank?
+      return if record.discarded?
       # ugc内容需要开软删，便于撤销&查看统计，可以定时删除统计并删除软删内容，类似回收站机制
       raise NoMethodError.new("undefined censor_delete for record") unless record.respond_to?(:censor_delete)
 
@@ -18,6 +20,7 @@ module CensorBear
     end
 
     def approve
+      return if record.blank?
       raise NoMethodError unless record.respond_to?(:censor_approve)
 
       ret = record.censor_approve
@@ -25,6 +28,7 @@ module CensorBear
     end
 
     def ban_user
+      return if record.blank?
       raise NoMethodError unless record.respond_to?(:censor_ban_user)
 
       ret = record.censor_ban_user

data/app/models/censor_bear/stop_word.rb

@@ -1,7 +1,7 @@
 module CensorBear
   class StopWord < ApplicationRecord
-    FIELDS = %w(ugc username nickname signature dialog)
-    ACTIONS_MAP = %w(ignore mod banned replace)
+    FIELDS = %w(ugc username nickname signature dialog).freeze
+    ACTIONS_MAP = %w(ignore mod banned replace).freeze
     belongs_to :user, class_name: CensorBear.config.user_class
   end
 end

data/app/views/censor_bear/home/debug.turbo_stream.haml

@@ -0,0 +1,8 @@
+= turbo_stream.update(:result) do
+  %h3{class: "text-lg"} 检测结果
+  %div{class: "bg-yellow-100 text-yellow-700 p-4 rounded-lg"}
+    %pre{class: "whitespace-pre-wrap"}
+      - if @r.is_a?(MatchData)
+        = @r.pretty_inspect
+      - else
+        = JSON.pretty_generate(@r.is_a?(CensorBear::Result) ? JSON.parse(@r.to_json) : @r)

data/app/views/censor_bear/home/debugger.html.haml

@@ -0,0 +1,9 @@
+%div{class: "flex flex-col space-y-2 rounded-lg border p-4"}
+  %h2{class: "text-xl font-medium text-center"} 在线调试
+  %div{class: "flex justify-center"}
+    = form_with(url: debug_path, method: :post, class: "flex flex-col items-center w-full space-y-4") do |f|
+      = f.select :stage, options_for_select([%w[check_text check_text], %w[check_search check_search], %w[check_search check_search], %w[qq_regex qq_regex], %w[wx_regex wx_regex]], params[:stage]), {}, class: "border rounded-md m py-0.5 px-1"
+      = f.select :type, options_for_select(CensorBear::StopWord::FIELDS.map{|f| [f.upcase, f]}, params[:type]), {}, class: "border rounded-md m py-0.5 px-1"
+      = f.text_area :content, value: params[:content], placeholder: "输入正文", rows: 6, class: "bg-gray-100 rounded-lg p-4 w-full"
+      = f.submit "检测", class: "rounded-lg px-10 py-1 bg-black text-white cursor-pointer"
+  #result

data/app/views/censor_bear/home/index.html.erb

@@ -0,0 +1,2 @@
+<h1>Home#index</h1>
+<p>Find me in app/views/censor_bear/home/index.html.erb</p>

data/app/views/censor_bear/logs/_log.html.haml

@@ -9,6 +9,12 @@
             %span{class: "text-sm bg-pink-100 text-pink-600 py-1 px-2 rounded-lg"}=t("censor_log.stage.#{log.stage}")
           - unless log.action.blank?
             %span{class: "text-sm bg-yellow-100 text-yellow-600 py-1 px-2 rounded-lg"}=t("censor_log.action.#{log.action.downcase}")
+          - unless log.suggestion.blank?
+            %span{class: "text-sm bg-green-100 text-green-600 py-1 px-2 rounded-lg"}=log.suggestion.upcase
+          - unless log.rate.blank?
+            %span{class: "text-sm bg-green-100 text-green-600 py-1 px-2 rounded-lg"}=log.rate
+          - unless log.label.blank?
+            %span{class: "text-sm bg-green-100 text-green-600 py-1 px-2 rounded-lg"}=log.label.upcase
           - unless log.user_id.blank?
             %span{class: "text-sm bg-gray-100 text-gray-600 py-1 px-2 rounded-lg font-bold"}="##{log.user_id}"
           - unless log.ip.blank?
@@ -19,7 +25,7 @@
           %span{class: "text-sm bg-gray-100 text-gray-600 py-1 px-2 rounded-lg"}= log.created_at
         %div{class: "flex space-x-2 items-center"}
           %span
-            = link_to '详情', log
+            = link_to '详情', log, data: { turbo: false }
           %span
             = button_to '删除', log, method: :delete, data: { confirm: 'Are you sure?' }, class: "text-red-600 rounded-md px-2 py-0.5"
       %div{class: "flex justify-between items-center"}
@@ -32,5 +38,5 @@
         %div{class: "text-yellow-500 font-meidum text-xl"}
           - log.mod_words.each do |word|
             %span [
-            %span= link_to word, stop_words_path(q: word), data: { turbo: false }, target: "_blank"
+            %span= link_to word, stop_words_path(q: word), data: { turbo: false }
             %span ]

data/app/views/censor_bear/logs/index.html.haml

@@ -4,10 +4,11 @@
       = form_with(url: logs_path, method: :get, class: "flex items-center") do |f|
         %div{class: "space-x-0.5"}
           = f.text_field :q, value: params[:q], placeholder: "关键词", class: "border rounded-md m py-0.5 px-1"
+          = f.select :stage, options_for_select([%w[aliyun_check aliyun_check], %w[aliyun_check aliyun_check], %w[qq_regex qq_regex], %w[wx_regex wx_regex], %w[local_check local_check]], params[:stage]), {include_blank: "-- 按Stage筛选 --"}, class: "border rounded-md m py-0.5 px-1"
           = f.submit "检索", class: "rounded-md px-2 py-1 text-sm bg-black text-white cursor-pointer"
           = link_to "重置", logs_path, class: "text-sm"
 
-    %div="共 #{@pagy.count} 条"
+    %div{class: "text-sm text-gray-600"}="共 #{@pagy.count} 条"
   %div
     - if @logs.blank?
       %div{class: "flex justify-center text-gray-500 p-8 border rounded-md"} 空空如也

data/app/views/censor_bear/logs/show.html.haml

@@ -0,0 +1,29 @@
+%div{class: "flex flex-col space-y-2"}
+  %div
+    %div{class: "font-bold"} 源内容:
+    %div= @log.original_content
+  %div
+    %div{class: "font-bold"} 过滤后内容:
+    %div= @log.filtered_content
+  %div
+    %div{class: "font-bold"} 动作:
+    %div= @log.action
+  %div
+    %div{class: "font-bold"} 场景:
+    %div= @log.scenario
+  %div
+    %div{class: "font-bold"} 检测阶段:
+    %div= @log.stage
+  %div
+    %div{class: "font-bold"} 命中敏感词:
+    %div= @log.mod_words
+  %div
+    %div{class: "font-bold"} 云检测返回标签:
+    %div= @log.labels
+  %div
+    %div{class: "font-bold"} 云检测返回标签:
+    %div= @log.labels
+  %div
+    %div{class: "font-bold"} 云检测返回:
+    %div{class: "p-1 bg-gray-100 rounded-lg"}
+      %pre= JSON.pretty_generate(@log.response)

data/app/views/censor_bear/mod_logs/index.html.haml

@@ -7,7 +7,7 @@
           = f.submit "检索", class: "rounded-md px-2 py-1 text-sm bg-black text-white cursor-pointer"
           = link_to "重置", mod_logs_path, class: "text-sm"
 
-    %div="共 #{@pagy.count} 条"
+    %div{class: "text-sm text-gray-600"}="共 #{@pagy.count} 条"
   %div
     - if @mod_logs.blank?
       %div{class: "flex justify-center text-gray-500 p-8 border rounded-md"} 空空如也

data/app/views/censor_bear/stop_words/index.html.haml

@@ -4,10 +4,11 @@
       = form_with(url: stop_words_path, method: :get, class: "flex items-center") do |f|
         %div{class: "space-x-0.5"}
           = f.text_field :q, value: params[:q], placeholder: "关键词", class: "border rounded-md m py-0.5 px-1"
+          = f.select :filter, options_for_select([%w[长度为1 size_one], %w[长度为2 size_two], %w[长度为3 size_three]], params[:filter]), {include_blank: "-- 按敏感词长度筛选 --"}, class: "border rounded-md m py-0.5 px-1"
           = f.submit "检索", class: "rounded-md px-2 py-1 text-sm bg-black text-white cursor-pointer"
           = link_to "重置", stop_words_path, class: "text-sm"
-
     %div
+      %span{class: "text-sm text-gray-600"}="共 #{@pagy.count} 条"
       = link_to '批量导入', "#", class: "text-sm"
       = link_to '新增', new_stop_word_path, class: "rounded-md px-2 py-1 text-sm bg-black text-white cursor-pointer"
   %div

data/app/views/layouts/censor_bear/application.html.haml

@@ -10,9 +10,10 @@
   %body{class: "flex flex-col space-y-6 p-4"}
     %ul{class: "flex justify-end items-center space-x-2 text-blue-600"}
       %li= link_to "审查(#{CensorBear::ModLog.pending.count})", mod_logs_path
-      %li= link_to "敏感词", stop_words_path
       %li= link_to "日志", logs_path
-      %li= link_to "回主站", "/"
+      %li= link_to "敏感词", stop_words_path
+      %li= link_to "调试", debugger_path
+      %li= link_to "控制台", main_app.send(CensorBear.config.main_app_root_path_method.to_sym)
       %li= current_user.email
     %div
       = yield

data/config/locales/censor_bear.yml

@@ -9,6 +9,7 @@ en:
       pass: 忽略
       review: 审核
     stage:
+      check_search: 搜索检查
       aliyun_check: 阿里云检查
       tencent_check: 腾讯云检查
       local_check: 本地检查

data/config/routes.rb

@@ -8,5 +8,9 @@ CensorBear::Engine.routes.draw do
   resources :logs
   resources :stop_words
 
-  root to: "stop_words#index"
+  get '/welcome', to: 'home#index'
+  get '/debugger', to: 'home#debugger'
+  post '/debug', to: 'home#debug'
+
+  root to: 'mod_logs#index'
 end

data/db/migrate/20211209093050_add_response_to_censor_bear_logs.rb

@@ -0,0 +1,5 @@
+class AddResponseToCensorBearLogs < ActiveRecord::Migration[6.0]
+  def change
+    add_column :censor_bear_logs, :response, :json
+  end
+end

data/lib/censor_bear/censor.rb

@@ -30,15 +30,15 @@ module CensorBear
       return Result.new(@content) unless CensorBear::StopWord::FIELDS.include?(@type)
 
       # 正则过滤
-      if @content.match(QQ_REG)
-        CensorBear.info(@content, @type, 'BANNED', 'qq_regex', ip: @ip, user_id: @user_id)
-        raise NotPassedException
-      end
+      # if @content.match(QQ_REG)
+      #   CensorBear.info(@content, @type, 'BANNED', 'qq_regex', ip: @ip, user_id: @user_id)
+      #   raise NotPassedException
+      # end
 
-      if @content.match(WX_REG)
-        CensorBear.info(@content, @type, 'BANNED', 'wx_regex', ip: @ip, user_id: @user_id)
-        raise NotPassedException
-      end
+      # if @content.match(WX_REG)
+      #   CensorBear.info(@content, @type, 'BANNED', 'wx_regex', ip: @ip, user_id: @user_id)
+      #   raise NotPassedException
+      # end
 
       # 本地自定义词库粗查
       local_check
@@ -115,32 +115,44 @@ module CensorBear
       rate = r['rate']
       @mod_words = concat_words(r['details'])
       @labels = concat_labels(r['details'])
-      if action == 'block' && rate >= 70 && %w[politics terrorism abuse].include?(r['label'])
+      if action == 'block' && rate >= 70 && %w[politics terrorism].include?(r['label'])
         CensorBear.info(
-          d['content'], @type, action, 'aliyun_check',
+          d['content'], @type, 'banned', 'aliyun_check',
           filtered_content: d['filteredContent'],
           mod_words: @mod_words,
           labels: @labels,
-          ip: @ip, user_id: @user_id
+          ip: @ip, user_id: @user_id,
+          response: response
         )
         raise NotPassedException
-      elsif action == 'block'
+      elsif action == 'block' && rate >= 90
         @is_mod = true
         CensorBear.info(
-          d['content'], @type, action, 'aliyun_check',
+          d['content'], @type, 'mod', 'aliyun_check',
           filtered_content: d['filteredContent'],
           mod_words: @mod_words,
           labels: @labels,
-          ip: @ip, user_id: @user_id
+          ip: @ip, user_id: @user_id,
+          response: response
         )
       elsif action == 'review'
         @is_mod = true
         CensorBear.info(
-          d['content'], @type, action, 'aliyun_check',
+          d['content'], @type, 'mod', 'aliyun_check',
           filtered_content: d['filteredContent'],
           mod_words: @mod_words,
           labels: @labels,
-          ip: @ip, user_id: @user_id
+          ip: @ip, user_id: @user_id,
+          response: response
+        )
+      else
+        CensorBear.info(
+          d['content'], @type, 'ignore', 'aliyun_check',
+          filtered_content: d['filteredContent'],
+          mod_words: @mod_words,
+          labels: @labels,
+          ip: @ip, user_id: @user_id,
+          response: response
         )
       end
     end
@@ -149,6 +161,7 @@ module CensorBear
 
     def concat_labels(data)
       return [] if data.blank?
+
       labels = []
       data.map do |d|
         next if d['label'].blank?
@@ -160,6 +173,7 @@ module CensorBear
 
     def concat_words(data)
       return [] if data.blank?
+
       words = []
       data.each do |d|
         next if d['contexts'].blank?

data/lib/censor_bear/configuration.rb

@@ -17,5 +17,7 @@ module CensorBear
     attr_accessor :aliyun_green_access_key_id
     attr_accessor :aliyun_green_access_key_secret
     attr_accessor :aliyun_green_enable_internal
+
+    attr_accessor :main_app_root_path_method
   end
 end

data/lib/censor_bear/version.rb

@@ -1,3 +1,3 @@
 module CensorBear
-  VERSION = '0.1.10'.freeze
+  VERSION = '0.1.14'.freeze
 end

data/lib/censor_bear.rb

@@ -24,6 +24,8 @@ module CensorBear
       @config.aliyun_green_access_key_id = ''
       @config.aliyun_green_access_key_secret = ''
       @config.aliyun_green_enable_internal = false
+      @config.main_app_root_path_method = 'root_path'
+
       @config
     end
 
@@ -45,6 +47,7 @@ module CensorBear
       labels = options[:labels] || []
       ip = options[:ip] || nil
       user_id = options[:user_id] || nil
+      response = options[:response] || {}
 
       CensorBear::Log.create(
         original_content: content,
@@ -56,6 +59,7 @@ module CensorBear
         labels: labels,
         ip: ip,
         user_id: user_id,
+        response: response
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: censor_bear
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.14
 platform: ruby
 authors:
 - 42up
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,16 +112,19 @@ files:
 - Rakefile
 - app/assets/config/censor_bear_manifest.js
 - app/assets/stylesheets/censor_bear/application.css
+- app/assets/stylesheets/censor_bear/home.css
 - app/assets/stylesheets/censor_bear/logs.css
 - app/assets/stylesheets/censor_bear/mod_logs.css
 - app/assets/stylesheets/censor_bear/stop_words.css
 - app/assets/stylesheets/censor_bear/tailwind.min.css
 - app/assets/stylesheets/scaffold.css
 - app/controllers/censor_bear/application_controller.rb
+- app/controllers/censor_bear/home_controller.rb
 - app/controllers/censor_bear/logs_controller.rb
 - app/controllers/censor_bear/mod_logs_controller.rb
 - app/controllers/censor_bear/stop_words_controller.rb
 - app/helpers/censor_bear/application_helper.rb
+- app/helpers/censor_bear/home_helper.rb
 - app/helpers/censor_bear/logs_helper.rb
 - app/helpers/censor_bear/mod_logs_helper.rb
 - app/helpers/censor_bear/stop_words_helper.rb
@@ -131,13 +134,16 @@ files:
 - app/models/censor_bear/log.rb
 - app/models/censor_bear/mod_log.rb
 - app/models/censor_bear/stop_word.rb
+- app/views/censor_bear/home/debug.turbo_stream.haml
+- app/views/censor_bear/home/debugger.html.haml
+- app/views/censor_bear/home/index.html.erb
 - app/views/censor_bear/logs/_form.html.erb
 - app/views/censor_bear/logs/_log.html.haml
 - app/views/censor_bear/logs/destroy.turbo_stream.haml
 - app/views/censor_bear/logs/edit.html.erb
 - app/views/censor_bear/logs/index.html.haml
 - app/views/censor_bear/logs/new.html.erb
-- app/views/censor_bear/logs/show.html.erb
+- app/views/censor_bear/logs/show.html.haml
 - app/views/censor_bear/mod_logs/_form.html.erb
 - app/views/censor_bear/mod_logs/_mod_log.html.haml
 - app/views/censor_bear/mod_logs/destroy.turbo_stream.haml
@@ -162,6 +168,7 @@ files:
 - db/migrate/20211129110218_create_censor_bear_mod_logs.rb
 - db/migrate/20211206092626_add_ip_to_censor_bear_logs.rb
 - db/migrate/20211208041114_add_labels_to_censor_bear_logs.rb
+- db/migrate/20211209093050_add_response_to_censor_bear_logs.rb
 - lib/censor_bear.rb
 - lib/censor_bear/censor.rb
 - lib/censor_bear/configuration.rb

data/app/views/censor_bear/logs/show.html.erb

@@ -1,34 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong>Orginal content:</strong>
-  <%= @log.original_content %>
-</p>
-
-<p>
-  <strong>Action:</strong>
-  <%= @log.action %>
-</p>
-
-<p>
-  <strong>Scenario:</strong>
-  <%= @log.scenario %>
-</p>
-
-<p>
-  <strong>Stage:</strong>
-  <%= @log.stage %>
-</p>
-
-<p>
-  <strong>Filtered content:</strong>
-  <%= @log.filtered_content %>
-</p>
-
-<p>
-  <strong>Mod words:</strong>
-  <%= @log.mod_words %>
-</p>
-
-<%= link_to 'Edit', edit_log_path(@log) %> |
-<%= link_to 'Back', logs_path %>