Merge branch 'main' into 606-print-all-field-info-when-no-details-are-defined

2022-06-29 22:31:38 +09:00
parent b10ffa07d8 11eadf439e
commit 70f03887e8
15 changed files with 65 additions and 737 deletions
--- a/CHANGELOG-Japanese.md
+++ b/CHANGELOG-Japanese.md
@@ -1,19 +1,19 @@
 # 変更点

-## v1.4.1 [2022/0X/XX]
+## v1.4.1 [2022/xx/xx]

-**New Features:**
+**新機能:**

- XX
+- XXX

-**Enhancements:**
+**改善:**

 - ルールや`default_details.txt` に対応する`details`の記載がない場合、すべてのフィールド情報を結果の``Details`列に出力するようにした (#606) (@hitenkoku)
+- `--deep-scan`オプションの追加。 このオプションがない場合、`config/target_event_ids.txt`で指定されたイベントIDのみをスキャン対象とします。 このオプションをつけることですべてのイベントIDをスキャン対象とします。(#608) (@hitenkoku)

-**Bug Fixes:**
-
- XX
+**バグ修正:**

+- XXX

 ## v1.4.0 [2022/06/26]

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,18 +1,19 @@
 # Changes

-## v1.4.1 [2022/0X/XX]
+## v1.4.1 [2022/xx/xx]

 **New Features:**

- XX
+- XXX

 **Enhancements:**

 - Changed output all field info when no details are defined in rule and `default_details.txt` . (#606) (@hitenkoku)
+- Added the `-D, --deep-scan` option. Now by default, events are filtered by Event IDs that there are detection rules for defined in `rules/config/target_event_IDs.txt`. This should improve performance by 25~55% while still detecting almost everything. If you want to do a thorough scan on all events, you can disable the event ID filter with `-D, --deep-scan`. (#608) (@hitenkoku)

 **Bug Fixes:**

- XX
+- XXX

 ## v1.4.0 [2022/06/26]

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -220,9 +220,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "3.2.6"
+version = "3.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f1fe12880bae935d142c8702d500c63a4e8634b6c3c57ad72bf978fc7b6249a"
+checksum = "5b7b16274bb247b45177db843202209b12191b631a14a9d06e41b3777d6ecf14"
 dependencies = [
 "atty",
 "bitflags",
@@ -237,9 +237,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "3.2.6"
+version = "3.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6db9e867166a43a53f7199b5e4d1f522a1e5bd626654be263c999ce59df39a"
+checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902"
 dependencies = [
 "heck",
 "proc-macro-error",
@@ -250,9 +250,9 @@ dependencies = [

 [[package]]
 name = "clap_lex"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87eba3c8c7f42ef17f6c659fc7416d0f4758cd3e58861ee63c5fa4a4dde649e4"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
 dependencies = [
 "os_str_bytes",
 ]
@@ -673,12 +673,12 @@ dependencies = [

 [[package]]
 name = "hayabusa"
-version = "1.4.0"
+version = "1.4.1-dev"
 dependencies = [
 "base64",
 "bytesize",
 "chrono",
- "clap 3.2.6",
+ "clap 3.2.7",
 "crossbeam-utils",
 "csv",
 "downcast-rs",
@@ -914,7 +914,7 @@ dependencies = [
 "anyhow",
 "atty",
 "chrono",
- "clap 3.2.6",
+ "clap 3.2.7",
 "file-chunker",
 "indicatif",
 "memmap2",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hayabusa"
-version = "1.4.0"
+version = "1.4.1-dev"
 authors = ["Yamato Security @SecurityYamato"]
 edition = "2021"

--- a/README-Japanese.md
+++ b/README-Japanese.md
@@ -333,7 +333,8 @@ OPTIONS:
    -c, --rules-config <RULE_CONFIG_DIRECTORY>    ルールフォルダのコンフィグディレクトリ (デフォルト: ./rules/config)
        --contributors                            コントリビュータの一覧表示
    -d, --directory <DIRECTORY>                   .evtxファイルを持つディレクトリのパス
-    -D, --enable-deprecated-rules                 Deprecatedルールを有効にする
+    -D, --deep-scan                               すべてのイベントIDを対象にしたスキャンを行う
+        --enable-deprecated-rules                 Deprecatedルールを有効にする
        --end-timeline <END_TIMELINE>             解析対象とするイベントログの終了時刻 (例: "2022-02-22 23:59:59 +09:00")
        --exclude-status <EXCLUDE_STATUS>...      読み込み対象外とするルール内でのステータス (ex: experimental) (ex: stable test)
    -f, --filepath <FILE_PATH>                    1つの.evtxファイルに対して解析を行う
@@ -505,7 +506,7 @@ Hayabusaの結果を標準出力に表示しているとき（デフォルト）
 * `Level`: YML検知ルールの`level`フィールドから来ています。(例：`informational`, `low`, `medium`, `high`, `critical`) デフォルトでは、すべてのレベルのアラートとイベントが出力されますが、`-m`オプションで最低のレベルを指定することができます。例えば`-m high`オプションを付けると、`high`と`critical`アラートしか出力されません。
 * `Title`: YML検知ルールの`title`フィールドから来ています。
 * `RecordID`: イベントレコードIDです。`<Event><System><EventRecordID>`フィールドから来ています。`-R`もしくは`--hide-record-id`オプションを付けると表示されません。
-* `Details`: YML検知ルールの`details`フィールドから来ていますが、このフィールドはHayabusaルールにしかありません。このフィールドはアラートとイベントに関する追加情報を提供し、ログのフィールドから有用なデータを抽出することができます。イベントキーのマッピングが間違っている場合、もしくはフィールドが存在しない場合で抽出ができなかった箇所は`n/a` (not available)と記載されます。YML検知ルールに`details`フィールドが存在しない時のdetailsのメッセージを`./rules/config/default_details.txt`で設定できます。`default_details.txt`では`Provider Name`、`EventID`、`details`の組み合わせで設定することができます。``default_details.txt`やYML検知ルールに対応するルールが記載されていない場合はすべてのフィールド情報を出力します。
+* `Details`: YML検知ルールの`details`フィールドから来ていますが、このフィールドはHayabusaルールにしかありません。このフィールドはアラートとイベントに関する追加情報を提供し、ログのフィールドから有用なデータを抽出することができます。イベントキーのマッピングが間違っている場合、もしくはフィールドが存在しない場合で抽出ができなかった箇所は`n/a` (not available)と記載されます。YML検知ルールに`details`フィールドが存在しない時のdetailsのメッセージを`rules/config/default_details.txt`で設定できます。`default_details.txt`では`Provider Name`、`EventID`、`details`の組み合わせで設定することができます。default_details.txt`やYML検知ルールに対応するルールが記載されていない場合はすべてのフィールド情報を出力します。

 CSVファイルとして保存する場合、以下の列が追加されます:

@@ -549,7 +550,7 @@ CSVファイルとして保存する場合、以下の列が追加されます:
 ## Channel情報の省略

 簡潔に出力するためにChannelの表示を以下のように省略しています。
-`config/channel_abbreviations.txt`の設定ファイルで自由に編集できます。
+`rules/config/channel_abbreviations.txt`の設定ファイルで自由に編集できます。

 * `App` : `Application`
 * `AppLocker` : `Microsoft-Windows-AppLocker/*`
@@ -588,7 +589,7 @@ CSVファイルとして保存する場合、以下の列が追加されます:
 ## 標準出力へのカラー設定

 Hayabusaの結果は`level`毎に文字色が変わります。
-`./config/level_color.txt`の値を変更することで文字色を変えることができます。
+`config/level_color.txt`の値を変更することで文字色を変えることができます。
 形式は`level名,(6桁のRGBのカラーhex)`です。
 カラー出力をしないようにしたい場合は`--no-color`オプションをご利用ください。

@@ -659,10 +660,10 @@ Hayabusaルールは、Windowsのイベントログ解析専用に設計され
 ## 検知レベルのlevelチューニング

 Hayabusaルール、Sigmaルールはそれぞれの作者が検知した際のリスクレベルを決めています。
-ユーザが独自のリスクレベルに設定するには`./rules/config/level_tuning.txt`に変換情報を書き、`hayabusa-1.4.0-win-x64.exe --level-tuning`を実行することでルールファイルが書き換えられます。
+ユーザが独自のリスクレベルに設定するには`rules/config/level_tuning.txt`に変換情報を書き、`hayabusa-1.4.0-win-x64.exe --level-tuning`を実行することでルールファイルが書き換えられます。
 ルールファイルが直接書き換えられることに注意して使用してください。

-`./rules/config/level_tuning.txt`の例:
+`rules/config/level_tuning.txt`の例:
 ```
 id,new_level
 00000000-0000-0000-0000-000000000000,informational # sample level tuning line
@@ -672,12 +673,10 @@ id,new_level

 ## イベントIDフィルタリング

-`config/target_eventids.txt`にイベントID番号を追加することで、イベントIDでフィルタリングすることができます。
-これはパフォーマンスを向上させるので、特定のIDだけを検索したい場合に推奨されます。
-
-すべてのルールの`EventID`フィールドと実際のスキャン結果で見られるIDから作成したIDフィルタリストのサンプルを[`config/target_eventids_sample.txt`](https://github.com/Yamato-Security/hayabusa/blob/main/config/target_eventids_sample.txt)で提供しています。
-
-最高のパフォーマンスを得たい場合はこのリストを使用してください。ただし、検出漏れの可能性が若干あることにご注意ください。
+バージョン1.4.1以降では、デフォルトでパフォーマンスを上げるために、検知ルールでイベントIDが定義されていないイベントを無視しています。
+デフォルトでは`rules/config/target_event_IDs.txt`で定義されたIDがスキャンされます。
+If you want to scan all events, please use the `-D, --deep-scan` option.
+すべてのイベントをスキャンしたい場合は、`-D, --deep-scan`オプションを使用してください。

 # その他のWindowsイベントログ解析ツールおよび関連リソース

--- a/README.md
+++ b/README.md
@@ -329,7 +329,8 @@ OPTIONS:
    -c, --rules-config <RULE_CONFIG_DIRECTORY>    Specify custom rule config folder (default: ./rules/config)
        --contributors                            Print the list of contributors
    -d, --directory <DIRECTORY>                   Directory of multiple .evtx files
-    -D, --enable-deprecated-rules                 Enable rules marked as deprecated
+    -D, --deep-scan                               Disable event ID filter to scan all events
+        --enable-deprecated-rules                 Enable rules marked as deprecated
        --end-timeline <END_TIMELINE>             End time of the event logs to load (ex: "2022-02-22 23:59:59 +09:00")
        --exclude-status <EXCLUDE_STATUS>...      Ignore rules according to status (ex: experimental) (ex: stable test)
    -f, --filepath <FILE_PATH>                    File path to one .evtx file
@@ -502,7 +503,7 @@ When hayabusa output is being displayed to the screen (the default), it will dis
 * `Level`: This comes from the `level` field in the YML detection rule. (`informational`, `low`, `medium`, `high`, `critical`) By default, all level alerts will be displayed but you can set the minimum level with `-m`. For example, you can set `-m high`) in order to only scan for and display high and critical alerts.
 * `RecordID`: This comes from the `<Event><System><EventRecordID>` field in the event log. You can hidde this output with the `-R` or `--hide-record-id` option.
 * `Title`: This comes from the `title` field in the YML detection rule.
-* `Details`: This comes from the `details` field in the YML detection rule, however, only hayabusa rules have this field. This field gives extra information about the alert or event and can extract useful data from the fields in event logs. For example, usernames, command line information, process information, etc... When a placeholder points to a field that does not exist or there is an incorrect alias mapping, it will be outputted as `n/a` (not available). If the `details` field is not specified (i.e. sigma rules), default `details` messages to extract fields defined in `./rules/config/default_details.txt` will be outputted. You can add more default `details` messages by adding the `Provider　Name`, `EventID` and `details` message you want to output in `default_details.txt`. When no description in `default_details.txt` and the YML detection rule, all fields information will be outputted.
+* `Details`: This comes from the `details` field in the YML detection rule, however, only hayabusa rules have this field. This field gives extra information about the alert or event and can extract useful data from the fields in event logs. For example, usernames, command line information, process information, etc... When a placeholder points to a field that does not exist or there is an incorrect alias mapping, it will be outputted as `n/a` (not available). If the `details` field is not specified (i.e. sigma rules), default `details` messages to extract fields defined in `rules/config/default_details.txt` will be outputted. You can add more default `details` messages by adding the `Provider　Name`, `EventID` and `details` message you want to output in `default_details.txt`. When no description in `default_details.txt` and the YML detection rule, all fields information will be outputted.

 The following additional columns will be added to the output when saving to a CSV file:

@@ -546,7 +547,7 @@ If you want to output all the tags defined in a rule, please specify the `--all-
 ## Channel Abbreviations

 In order to save space, we use the following abbreviations when displaying Channel.
-You can freely edit these abbreviations in the `config/channel_abbreviations.txt` configuration file.
+You can freely edit these abbreviations in the `rules/config/channel_abbreviations.txt` configuration file.

 * `App` : `Application`
 * `AppLocker` : `Microsoft-Windows-AppLocker/*`
@@ -585,7 +586,7 @@ It will display in real time the number and percent of evtx files that it has fi
 ## Color Output

 The alerts will be outputted in color based on the alert `level`.
-You can change the default colors in the config file at `./config/level_color.txt` in the format of `level,(RGB 6-digit ColorHex)`.
+You can change the default colors in the config file at `config/level_color.txt` in the format of `level,(RGB 6-digit ColorHex)`.
 If you want to disable color output, you can use `--no-color` option.

 ## Event Fequency Timeline
@@ -655,10 +656,10 @@ You can also add a rule ID to `rules/config/noisy_rules.txt` in order to ignore

 Hayabusa and Sigma rule authors will determine the risk level of the alert when writing their rules.
 However, the actual risk level will differ between environments.
-You can tune the risk level of the rules by adding them to `./rules/config/level_tuning.txt` and executing `hayabusa-1.4.0-win-x64.exe --level-tuning` which will update the `level` line in the rule file.
+You can tune the risk level of the rules by adding them to `rules/config/level_tuning.txt` and executing `hayabusa-1.4.0-win-x64.exe --level-tuning` which will update the `level` line in the rule file.
 Please note that the rule file will be updated directly.

-`./rules/config/level_tuning.txt` sample line:
+`rules/config/level_tuning.txt` sample line:

 ```
 id,new_level
@@ -669,12 +670,9 @@ In this case, the risk level of the rule with an `id` of `00000000-0000-0000-000

 ## Event ID Filtering

-You can filter on event IDs by placing event ID numbers in `config/target_eventids.txt`.
-This will increase performance so it is recommended if you only need to search for certain IDs.
-
-We have provided a sample ID filter list at [`config/target_eventids_sample.txt`](https://github.com/Yamato-Security/hayabusa/blob/main/config/target_eventids_sample.txt) created from the `EventID` fields in all of the rules as well as IDs seen in actual results.
-
-Please use this list if you want the best performance but be aware that there is a slight possibility for missing events (false negatives). 
+As of version 1.4.1, by default, events are filtered by ID to improve performance by ignorning events that have no detection rules.
+The IDs defined in `rules/config/target_event_IDs.txt` will be scanned by default.
+If you want to scan all events, please use the `-D, --deep-scan` option.

 # Other Windows Event Log Analyzers and Related Resources

--- a/config/channel_abbreviations.txt
+++ b/config/channel_abbreviations.txt
@@ -1,33 +0,0 @@
-Channel,Abbreviation
-Application,App
-DNS Server,DNS-Svr
-Key Management Service,KeyMgtSvc
-Microsoft-ServiceBus-Client,SvcBusCli
-Microsoft-Windows-CodeIntegrity/Operational,CodeInteg
-Microsoft-Windows-LDAP-Client/Debug,LDAP-Cli
-Microsoft-Windows-AppLocker/MSI and Script,AppLocker
-Microsoft-Windows-AppLocker/EXE and DLL,AppLocker
-Microsoft-Windows-AppLocker/Packaged app-Deployment,AppLocker
-Microsoft-Windows-AppLocker/Packaged app-Execution,AppLocker
-Microsoft-Windows-Bits-Client/Operational,BitsCli
-Microsoft-Windows-DHCP-Server/Operational,DHCP-Svr
-Microsoft-Windows-DriverFrameworks-UserMode/Operational,DvrFmwk
-Microsoft-Windows-NTLM/Operational,NTLM
-Microsoft-Windows-Security-Mitigations/KernelMode,SecMitig
-Microsoft-Windows-Security-Mitigations/UserMode,SecMitig
-Microsoft-Windows-SmbClient/Security,SmbCliSec
-Microsoft-Windows-Sysmon/Operational,Sysmon
-Microsoft-Windows-TaskScheduler/Operational,TaskSch
-Microsoft-Windows-TerminalServices-RDPClient/Operational,RDP-Client
-Microsoft-Windows-PrintService/Admin,PrintAdm
-Microsoft-Windows-PrintService/Operational,PrintOp
-Microsoft-Windows-PowerShell/Operational,PwSh
-Microsoft-Windows-Windows Defender/Operational,Defender
-Microsoft-Windows-Windows Firewall With Advanced Security/Firewall,Firewall
-Microsoft-Windows-WinRM/Operational,WinRM
-Microsoft-Windows-WMI-Activity/Operational,WMI
-MSExchange Management,Exchange
-OpenSSH/Operational,OpenSSH
-Security,Sec
-System,Sys
-Windows PowerShell,PwShClassic
--- a/config/statistics_event_info.txt
+++ b/config/statistics_event_info.txt
@@ -1,496 +0,0 @@
-eventid,event_title
-6406,%1 registered to Windows Firewall to control filtering for the following: %2
-1,Process Creation.
-2,File Creation Timestamp Changed. (Possible Timestomping)
-3,Network Connection.
-4,Sysmon Service State Changed.
-5,Process Terminated.
-6,Driver Loaded.
-7,Image Loaded.
-8,Remote Thread Created. (Possible Code Injection)
-9,Raw Access Read.
-10,Process Access.
-11,File Creation or Overwrite.
-12,Registry Object Created/Deletion.
-13,Registry Value Set.
-14,Registry Key or Value Rename.
-15,Alternate Data Stream Created.
-16,Sysmon Service Configuration Changed.
-17,Named Pipe Created.
-18,Named Pipe Connection.
-19,WmiEventFilter Activity.
-20,WmiEventConsumer Activity.
-21,WmiEventConsumerToFilter Activity.
-22,DNS Query.
-23,Deleted File Archived.
-24,Clipboard Changed.
-25,Process Tampering. (Possible Process Hollowing or Herpaderping)
-26,File Deleted.
-27,KDC Encryption Type Configuration
-31,Windows Update Failed
-34,Windows Update Failed
-35,Windows Update Failed
-43,New Device Information
-81,Processing client request for operation CreateShell
-82,Entering the plugin for operation CreateShell with a ResourceURI
-104,Event Log was Cleared
-106,A task has been scheduled
-134,Sending response for operation CreateShell
-169,Creating WSMan Session (on Server)
-255,Sysmon Error.
-400,New Mass Storage Installation
-410,New Mass Storage Installation
-800,Summary of Software Activities
-903,New Application Installation
-904,New Application Installation
-905,Updated Application
-906,Updated Application
-907,Removed Application
-908,Removed Application
-1001,BSOD
-1005,Scan Failed
-1006,Detected Malware
-1008,Action on Malware Failed
-1009,Hotpatching Failed
-1010,Failed to remove item from quarantine
-1022,New MSI File Installed
-1033,New MSI File Installed
-1100,The event logging service has shut down
-1101,Audit events have been dropped by the transport.
-1102,The audit log was cleared
-1104,The security Log is now full
-1105,Event log automatic backup
-1108,The event logging service encountered an error
-1125,Group Policy: Internal Error
-1127,Group Policy: Generic Internal Error
-1129,Group Policy: Group Policy Application Failed due to Connectivity
-1149,User authentication succeeded
-2001,Failed to update signatures
-2003,Failed to update engine
-2004,Firewall Rule Add
-2004,Reverting to last known good set of signatures
-2005,Firewall Rule Change
-2006,Firewall Rule Deleted
-2009,Firewall Failed to load Group Policy
-2033,Firewall Rule Deleted
-3001,Code Integrity Check Warning
-3002,Code Integrity Check Warning
-3002,Real-Time Protection failed
-3003,Code Integrity Check Warning
-3004,Code Integrity Check Warning
-3010,Code Integrity Check Warning
-3023,Code Integrity Check Warning
-4103,Module logging. Executing Pipeline.
-4104,Script Block Logging.
-4105,CommandStart - Started
-4106,CommandStart - Stoppeed
-4608,Windows is starting up
-4609,Windows is shutting down
-4610,An authentication package has been loaded by the Local Security Authority
-4611,A trusted logon process has been registered with the Local Security Authority
-4612,"Internal resources allocated for the queuing of audit messages have been exhausted, leading to the loss of some audits."
-4614,A notification package has been loaded by the Security Account Manager.
-4615,Invalid use of LPC port
-4616,The system time was changed.
-4618,A monitored security event pattern has occurred
-4621,Administrator recovered system from CrashOnAuditFail
-4622,A security package has been loaded by the Local Security Authority.
-4624,Logon Success
-4625,Logon Failure
-4627,Group Membership Information
-4634,Account Logoff
-4646,IKE DoS-prevention mode started
-4647,User initiated logoff
-4648,Explicit Logon
-4649,A replay attack was detected
-4650,An IPsec Main Mode security association was established
-4651,An IPsec Main Mode security association was established
-4652,An IPsec Main Mode negotiation failed
-4653,An IPsec Main Mode negotiation failed
-4654,An IPsec Quick Mode negotiation failed
-4655,An IPsec Main Mode security association ended
-4656,A handle to an object was requested
-4657,A registry value was modified
-4658,The handle to an object was closed
-4659,A handle to an object was requested with intent to delete
-4660,An object was deleted
-4661,A handle to an object was requested
-4662,An operation was performed on an object
-4663,An attempt was made to access an object
-4664,An attempt was made to create a hard link
-4665,An attempt was made to create an application client context.
-4666,An application attempted an operation
-4667,An application client context was deleted
-4668,An application was initialized
-4670,Permissions on an object were changed
-4671,An application attempted to access a blocked ordinal through the TBS
-4672,Admin Logon
-4673,A privileged service was called
-4674,An operation was attempted on a privileged object
-4675,SIDs were filtered
-4685,The state of a transaction has changed
-4688,Process Creation.
-4689,A process has exited
-4690,An attempt was made to duplicate a handle to an object
-4691,Indirect access to an object was requested
-4692,Backup of data protection master key was attempted
-4693,Recovery of data protection master key was attempted
-4694,Protection of auditable protected data was attempted
-4695,Unprotection of auditable protected data was attempted
-4696,A primary token was assigned to process
-4697,A service was installed in the system
-4698,A scheduled task was created
-4699,A scheduled task was deleted
-4700,A scheduled task was enabled
-4701,A scheduled task was disabled
-4702,A scheduled task was updated
-4704,A user right was assigned
-4705,A user right was removed
-4706,A new trust was created to a domain
-4707,A trust to a domain was removed
-4709,IPsec Services was started
-4710,IPsec Services was disabled
-4711,PAStore Engine
-4712,IPsec Services encountered a potentially serious failure
-4713,Kerberos policy was changed
-4714,Encrypted data recovery policy was changed
-4715,The audit policy (SACL) on an object was changed
-4716,Trusted domain information was modified
-4717,System security access was granted to an account
-4718,System security access was removed from an account
-4719,System audit policy was changed
-4720,A user account was created
-4722,A user account was enabled
-4723,An attempt was made to change an account's password
-4724,An attempt was made to reset an accounts password
-4725,A user account was disabled
-4726,A user account was deleted
-4727,A security-enabled global group was created
-4728,A member was added to a security-enabled global group
-4729,A member was removed from a security-enabled global group
-4730,A security-enabled global group was deleted
-4731,A security-enabled local group was created
-4732,A member was added to a security-enabled local group
-4733,A member was removed from a security-enabled local group
-4734,A security-enabled local group was deleted
-4735,A security-enabled local group was changed
-4737,A security-enabled global group was changed
-4738,A user account was changed
-4739,Domain Policy was changed
-4740,A user account was locked out
-4741,A computer account was created
-4742,A computer account was changed
-4743,A computer account was deleted
-4744,A security-disabled local group was created
-4745,A security-disabled local group was changed
-4746,A member was added to a security-disabled local group
-4747,A member was removed from a security-disabled local group
-4748,A security-disabled local group was deleted
-4749,A security-disabled global group was created
-4750,A security-disabled global group was changed
-4751,A member was added to a security-disabled global group
-4752,A member was removed from a security-disabled global group
-4753,A security-disabled global group was deleted
-4754,A security-enabled universal group was created
-4755,A security-enabled universal group was changed
-4756,A member was added to a security-enabled universal group
-4757,A member was removed from a security-enabled universal group
-4758,A security-enabled universal group was deleted
-4759,A security-disabled universal group was created
-4760,A security-disabled universal group was changed
-4761,A member was added to a security-disabled universal group
-4762,A member was removed from a security-disabled universal group
-4763,A security-disabled universal group was deleted
-4764,A groups type was changed
-4765,SID History was added to an account
-4766,An attempt to add SID History to an account failed
-4767,A user account was unlocked
-4768,A Kerberos authentication ticket (TGT) was requested
-4769,A Kerberos service ticket was requested
-4770,A Kerberos service ticket was renewed
-4771,Kerberos pre-authentication failed
-4772,A Kerberos authentication ticket request failed
-4773,A Kerberos service ticket request failed
-4774,An account was mapped for logon
-4775,An account could not be mapped for logon
-4776,The domain controller attempted to validate the credentials for an account
-4777,The domain controller failed to validate the credentials for an account
-4778,A session was reconnected to a Window Station
-4779,A session was disconnected from a Window Station
-4780,The ACL was set on accounts which are members of administrators groups
-4781,The name of an account was changed
-4782,The password hash an account was accessed
-4783,A basic application group was created
-4784,A basic application group was changed
-4785,A member was added to a basic application group
-4786,A member was removed from a basic application group
-4787,A non-member was added to a basic application group
-4788,A non-member was removed from a basic application group..
-4789,A basic application group was deleted
-4790,An LDAP query group was created
-4791,A basic application group was changed
-4792,An LDAP query group was deleted
-4793,The Password Policy Checking API was called
-4794,An attempt was made to set the Directory Services Restore Mode administrator password
-4800,The workstation was locked
-4801,The workstation was unlocked
-4802,The screen saver was invoked
-4803,The screen saver was dismissed
-4816,RPC detected an integrity violation while decrypting an incoming message
-4817,Auditing settings on object were changed.
-4864,A namespace collision was detected
-4865,A trusted forest information entry was added
-4866,A trusted forest information entry was removed
-4867,A trusted forest information entry was modified
-4868,The certificate manager denied a pending certificate request
-4869,Certificate Services received a resubmitted certificate request
-4870,Certificate Services revoked a certificate
-4871,Certificate Services received a request to publish the certificate revocation list (CRL)
-4872,Certificate Services published the certificate revocation list (CRL)
-4873,A certificate request extension changed
-4874,One or more certificate request attributes changed.
-4875,Certificate Services received a request to shut down
-4876,Certificate Services backup started
-4877,Certificate Services backup completed
-4878,Certificate Services restore started
-4879,Certificate Services restore completed
-4880,Certificate Services started
-4881,Certificate Services stopped
-4882,The security permissions for Certificate Services changed
-4883,Certificate Services retrieved an archived key
-4884,Certificate Services imported a certificate into its database
-4885,The audit filter for Certificate Services changed
-4886,Certificate Services received a certificate request
-4887,Certificate Services approved a certificate request and issued a certificate
-4888,Certificate Services denied a certificate request
-4889,Certificate Services set the status of a certificate request to pending
-4890,The certificate manager settings for Certificate Services changed.
-4891,A configuration entry changed in Certificate Services
-4892,A property of Certificate Services changed
-4893,Certificate Services archived a key
-4894,Certificate Services imported and archived a key
-4895,Certificate Services published the CA certificate to Active Directory Domain Services
-4896,One or more rows have been deleted from the certificate database
-4897,Role separation enabled
-4898,Certificate Services loaded a template
-4899,A Certificate Services template was updated
-4900,Certificate Services template security was updated
-4902,The Per-user audit policy table was created
-4904,An attempt was made to register a security event source
-4905,An attempt was made to unregister a security event source
-4906,The CrashOnAuditFail value has changed
-4907,Auditing settings on object were changed
-4908,Special Groups Logon table modified
-4909,The local policy settings for the TBS were changed
-4910,The group policy settings for the TBS were changed
-4912,Per User Audit Policy was changed
-4928,An Active Directory replica source naming context was established
-4929,An Active Directory replica source naming context was removed
-4930,An Active Directory replica source naming context was modified
-4931,An Active Directory replica destination naming context was modified
-4932,Synchronization of a replica of an Active Directory naming context has begun
-4933,Synchronization of a replica of an Active Directory naming context has ended
-4934,Attributes of an Active Directory object were replicated
-4935,Replication failure begins
-4936,Replication failure ends
-4937,A lingering object was removed from a replica
-4944,The following policy was active when the Windows Firewall started
-4945,A rule was listed when the Windows Firewall started
-4946,A change has been made to Windows Firewall exception list. A rule was added
-4947,A change has been made to Windows Firewall exception list. A rule was modified
-4948,A change has been made to Windows Firewall exception list. A rule was deleted
-4949,Windows Firewall settings were restored to the default values
-4950,A Windows Firewall setting has changed
-4951,A rule has been ignored because its major version number was not recognized by Windows Firewall
-4952,Parts of a rule have been ignored because its minor version number was not recognized by Windows Firewall
-4953,A rule has been ignored by Windows Firewall because it could not parse the rule
-4954,Windows Firewall Group Policy settings has changed. The new settings have been applied
-4956,Windows Firewall has changed the active profile
-4957,Windows Firewall did not apply the following rule
-4958,Windows Firewall did not apply the following rule because the rule referred to items not configured on this computer
-4960,IPsec dropped an inbound packet that failed an integrity check
-4961,IPsec dropped an inbound packet that failed a replay check
-4962,IPsec dropped an inbound packet that failed a replay check
-4963,IPsec dropped an inbound clear text packet that should have been secured
-4964,Special groups have been assigned to a new logon
-4965,IPsec received a packet from a remote computer with an incorrect Security Parameter Index (SPI).
-4976,"During Main Mode negotiation, IPsec received an invalid negotiation packet."
-4977,"During Quick Mode negotiation, IPsec received an invalid negotiation packet."
-4978,"During Extended Mode negotiation, IPsec received an invalid negotiation packet."
-4979,IPsec Main Mode and Extended Mode security associations were established
-4980,IPsec Main Mode and Extended Mode security associations were established
-4981,IPsec Main Mode and Extended Mode security associations were established
-4982,IPsec Main Mode and Extended Mode security associations were established
-4983,An IPsec Extended Mode negotiation failed
-4984,An IPsec Extended Mode negotiation failed
-4985,The state of a transaction has changed
-5008,Unexpected Error
-5024,The Windows Firewall Service has started successfully
-5025,The Windows Firewall Service has been stopped
-5027,The Windows Firewall Service was unable to retrieve the security policy from the local storage
-5028,The Windows Firewall Service was unable to parse the new security policy.
-5029,The Windows Firewall Service failed to initialize the driver
-5030,The Windows Firewall Service failed to start
-5031,The Windows Firewall Service blocked an application from accepting incoming connections on the network.
-5032,Windows Firewall was unable to notify the user that it blocked an application from accepting incoming connections on the network
-5033,The Windows Firewall Driver has started successfully
-5034,The Windows Firewall Driver has been stopped
-5035,The Windows Firewall Driver failed to start
-5037,The Windows Firewall Driver detected critical runtime error. Terminating
-5038,Code integrity determined that the image hash of a file is not valid
-5039,A registry key was virtualized.
-5040,A change has been made to IPsec settings. An Authentication Set was added.
-5041,A change has been made to IPsec settings. An Authentication Set was modified
-5042,A change has been made to IPsec settings. An Authentication Set was deleted
-5043,A change has been made to IPsec settings. A Connection Security Rule was added
-5044,A change has been made to IPsec settings. A Connection Security Rule was modified
-5045,A change has been made to IPsec settings. A Connection Security Rule was deleted
-5046,A change has been made to IPsec settings. A Crypto Set was added
-5047,A change has been made to IPsec settings. A Crypto Set was modified
-5048,A change has been made to IPsec settings. A Crypto Set was deleted
-5049,An IPsec Security Association was deleted
-5050,An attempt to programmatically disable the Windows Firewall using a call to INetFwProfile
-5051,A file was virtualized
-5056,A cryptographic self test was performed
-5057,A cryptographic primitive operation failed
-5058,Key file operation
-5059,Key migration operation
-5060,Verification operation failed
-5061,Cryptographic operation
-5062,A kernel-mode cryptographic self test was performed
-5063,A cryptographic provider operation was attempted
-5064,A cryptographic context operation was attempted
-5065,A cryptographic context modification was attempted
-5066,A cryptographic function operation was attempted
-5067,A cryptographic function modification was attempted
-5068,A cryptographic function provider operation was attempted
-5069,A cryptographic function property operation was attempted
-5070,A cryptographic function property operation was attempted
-5120,OCSP Responder Service Started
-5121,OCSP Responder Service Stopped
-5122,A Configuration entry changed in the OCSP Responder Service
-5123,A configuration entry changed in the OCSP Responder Service
-5124,A security setting was updated on OCSP Responder Service
-5125,A request was submitted to OCSP Responder Service
-5126,Signing Certificate was automatically updated by the OCSP Responder Service
-5127,The OCSP Revocation Provider successfully updated the revocation information
-5136,A directory service object was modified
-5137,A directory service object was created
-5138,A directory service object was undeleted
-5139,A directory service object was moved
-5140,A network share object was accessed
-5141,A directory service object was deleted
-5142,A network share object was added.
-5143,A network share object was modified
-5144,A network share object was deleted.
-5145,A network share object was checked to see whether client can be granted desired access
-5148,The Windows Filtering Platform has detected a DoS attack and entered a defensive mode; packets associated with this attack will be discarded.
-5149,The DoS attack has subsided and normal processing is being resumed.
-5150,The Windows Filtering Platform has blocked a packet.
-5151,A more restrictive Windows Filtering Platform filter has blocked a packet.
-5152,The Windows Filtering Platform blocked a packet
-5153,A more restrictive Windows Filtering Platform filter has blocked a packet
-5154,The Windows Filtering Platform has permitted an application or service to listen on a port for incoming connections
-5155,The Windows Filtering Platform has blocked an application or service from listening on a port for incoming connections
-5156,The Windows Filtering Platform has allowed a connection
-5157,The Windows Filtering Platform has blocked a connection
-5158,The Windows Filtering Platform has permitted a bind to a local port
-5159,The Windows Filtering Platform has blocked a bind to a local port
-5168,Spn check for SMB/SMB2 fails.
-5376,Credential Manager credentials were backed up
-5377,Credential Manager credentials were restored from a backup
-5378,The requested credentials delegation was disallowed by policy
-5440,The following callout was present when the Windows Filtering Platform Base Filtering Engine started
-5441,The following filter was present when the Windows Filtering Platform Base Filtering Engine started
-5442,The following provider was present when the Windows Filtering Platform Base Filtering Engine started
-5443,The following provider context was present when the Windows Filtering Platform Base Filtering Engine started
-5444,The following sub-layer was present when the Windows Filtering Platform Base Filtering Engine started
-5446,A Windows Filtering Platform callout has been changed
-5447,A Windows Filtering Platform filter has been changed
-5448,A Windows Filtering Platform provider has been changed
-5449,A Windows Filtering Platform provider context has been changed
-5450,A Windows Filtering Platform sub-layer has been changed
-5451,An IPsec Quick Mode security association was established
-5452,An IPsec Quick Mode security association ended
-5453,An IPsec negotiation with a remote computer failed because the IKE and AuthIP IPsec Keying Modules (IKEEXT) service is not started
-5456,PAStore Engine applied Active Directory storage IPsec policy on the computer
-5457,PAStore Engine failed to apply Active Directory storage IPsec policy on the computer
-5458,PAStore Engine applied locally cached copy of Active Directory storage IPsec policy on the computer
-5459,PAStore Engine failed to apply locally cached copy of Active Directory storage IPsec policy on the computer
-5460,PAStore Engine applied local registry storage IPsec policy on the computer
-5461,PAStore Engine failed to apply local registry storage IPsec policy on the computer
-5462,PAStore Engine failed to apply some rules of the active IPsec policy on the computer
-5463,PAStore Engine polled for changes to the active IPsec policy and detected no changes
-5464,"PAStore Engine polled for changes to the active IPsec policy, detected changes, and applied them to IPsec Services"
-5465,PAStore Engine received a control for forced reloading of IPsec policy and processed the control successfully
-5466,"PAStore Engine polled for changes to the Active Directory IPsec policy, determined that Active Directory cannot be reached, and will use the cached copy of the Active Directory IPsec policy instead"
-5467,"PAStore Engine polled for changes to the Active Directory IPsec policy, determined that Active Directory can be reached, and found no changes to the policy"
-5468,"PAStore Engine polled for changes to the Active Directory IPsec policy, determined that Active Directory can be reached, found changes to the policy, and applied those changes"
-5471,PAStore Engine loaded local storage IPsec policy on the computer
-5472,PAStore Engine failed to load local storage IPsec policy on the computer
-5473,PAStore Engine loaded directory storage IPsec policy on the computer
-5474,PAStore Engine failed to load directory storage IPsec policy on the computer
-5477,PAStore Engine failed to add quick mode filter
-5478,IPsec Services has started successfully
-5479,IPsec Services has been shut down successfully
-5480,IPsec Services failed to get the complete list of network interfaces on the computer
-5483,IPsec Services failed to initialize RPC server. IPsec Services could not be started
-5484,IPsec Services has experienced a critical failure and has been shut down
-5485,IPsec Services failed to process some IPsec filters on a plug-and-play event for network interfaces
-6144,Security policy in the group policy objects has been applied successfully
-6145,One or more errors occured while processing security policy in the group policy objects
-6272,Network Policy Server granted access to a user
-6273,Network Policy Server denied access to a user
-6274,Network Policy Server discarded the request for a user
-6275,Network Policy Server discarded the accounting request for a user
-6276,Network Policy Server quarantined a user
-6277,Network Policy Server granted access to a user but put it on probation because the host did not meet the defined health policy
-6278,Network Policy Server granted full access to a user because the host met the defined health policy
-6279,Network Policy Server locked the user account due to repeated failed authentication attempts
-6280,Network Policy Server unlocked the user account
-6281,Code Integrity determined that the page hashes of an image file are not valid... 
-6400,BranchCache: Received an incorrectly formatted response while discovering availability of content.
-6401,BranchCache: Received invalid data from a peer. Data discarded.
-6402,BranchCache: The message to the hosted cache offering it data is incorrectly formatted.
-6403,BranchCache: The hosted cache sent an incorrectly formatted response to the client.
-6404,BranchCache: Hosted cache could not be authenticated using the provisioned SSL certificate.
-6405,BranchCache: %2 instance(s) of event id %1 occurred.
-6407,1% (no more info in MSDN)
-6408,Registered product %1 failed and Windows Firewall is now controlling the filtering for %2
-6410,Code integrity determined that a file does not meet the security requirements to load into a process.
-7022,Windows Service Fail or Crash
-7023,The %1 service terminated with the following error: %2
-7023,Windows Service Fail or Crash
-7024,Windows Service Fail or Crash
-7026,Windows Service Fail or Crash
-7030,"The service is marked as an interactive service. However, the system is configured to not allow interactive services. This service may not function properly."
-7031,Windows Service Fail or Crash
-7032,Windows Service Fail or Crash
-7034,Windows Service Fail or Crash
-7035,The %1 service was successfully sent a %2 control.
-7036,The service entered the running/stopped state
-7040,The start type of the %1 service was changed from %2 to %3.
-7045,New Windows Service
-8000,Starting a Wireless Connection
-8001,Successfully connected to Wireless connection
-8002,Wireless Connection Failed
-8003,AppLocker Block Error
-8003,Disconnected from Wireless connection
-8004,AppLocker Block Warning
-8005,AppLocker permitted the execution of a PowerShell script
-8006,AppLocker Warning Error
-8007,AppLocker Warning
-8011,Starting a Wireless Connection
-10000,Network Connection and Disconnection Status (Wired and Wireless)
-10001,Network Connection and Disconnection Status (Wired and Wireless)
-11000,Wireless Association Status
-11001,Wireless Association Status
-11002,Wireless Association Status
-11004,"Wireless Security Started, Stopped, Successful, or Failed"
-11005,"Wireless Security Started, Stopped, Successful, or Failed"
-11006,"Wireless Security Started, Stopped, Successful, or Failed"
-11010,"Wireless Security Started, Stopped, Successful, or Failed"
-12011,Wireless Authentication Started and Failed
-12012,Wireless Authentication Started and Failed
-12013,Wireless Authentication Started and Failed
-unregistered_event_id,Unknown
--- a/config/target_eventids.txt
+++ b/config/target_eventids.txt
--- a/config/target_eventids_sample.txt
+++ b/config/target_eventids_sample.txt
@@ -1,154 +0,0 @@
-1
-10
-1000
-1001
-1006
-1013
-1015
-1031
-1032
-1033
-1034
-104
-106
-11
-1102
-1116
-1116
-1117
-1121
-12
-13
-14
-15
-150
-16
-17
-18
-19
-20
-2003
-21
-2100
-2102
-213
-217
-22
-23
-24
-255
-257
-26
-3
-30
-300
-301
-302
-316
-31017
-354
-4
-400
-400
-403
-40300
-40301
-40302
-4100
-4103
-4104
-4611
-4616
-4624
-4625
-4634
-4647
-4648
-4656
-4657
-4658
-4660
-4661
-4662
-4663
-4672
-4673
-4674
-4688
-4689
-4692
-4697
-4698
-4699
-4701
-4703
-4704
-4706
-4719
-4720
-4728
-4732
-4738
-4742
-4765
-4766
-4768
-4769
-4771
-4776
-4781
-4794
-4799
-4825
-4898
-4899
-4904
-4905
-4909
-5
-50
-5001
-5007
-5010
-5012
-5013
-5038
-5101
-5136
-5140
-5142
-5145
-5156
-517
-524
-528
-529
-55
-56
-5829
-5859
-5861
-59
-6
-600
-6281
-6416
-675
-7
-70
-7036
-7040
-7045
-770
-8
-800
-8001
-8002
-8004
-8007
-808
-823
-848
-849
-9
-98
--- a/2
+++ b/2
--- a/src/afterfact.rs
+++ b/src/afterfact.rs
@@ -721,8 +721,11 @@ mod tests {
    }

    fn test_emit_csv_output() {
-        let mock_ch_filter =
-            Message::create_output_filter_config("config/channel_abbreviations.txt", true, false);
+        let mock_ch_filter = Message::create_output_filter_config(
+            "rules/config/channel_abbreviations.txt",
+            true,
+            false,
+        );
        let test_filepath: &str = "test.evtx";
        let test_rulepath: &str = "test-rule.yml";
        let test_title = "test_title";
--- a/src/detections/configs.rs
+++ b/src/detections/configs.rs
@@ -115,9 +115,13 @@ pub struct Config {
    pub visualize_timeline: bool,

    /// Enable rules marked as deprecated
-    #[clap(short = 'D', long = "enable-deprecated-rules")]
+    #[clap(long = "enable-deprecated-rules")]
    pub enable_deprecated_rules: bool,

+    /// Disable event ID filter to scan all events
+    #[clap(short = 'D', long = "deep-scan")]
+    pub deep_scan: bool,
+
    /// Enable rules marked as noisy
    #[clap(short = 'n', long = "enable-noisy-rules")]
    pub enable_noisy_rules: bool,
@@ -238,13 +242,13 @@ impl ConfigReader<'_> {
            headless_help: String::default(),
            event_timeline_config: load_eventcode_info(
                CURRENT_EXE_PATH
-                    .join("config/statistics_event_info.txt")
+                    .join("rules/config/statistics_event_info.txt")
                    .to_str()
                    .unwrap(),
            ),
            target_eventids: load_target_ids(
                CURRENT_EXE_PATH
-                    .join("config/target_eventids.txt")
+                    .join("rules/config/target_event_IDs.txt")
                    .to_str()
                    .unwrap(),
            ),
--- a/src/detections/print.rs
+++ b/src/detections/print.rs
@@ -63,7 +63,7 @@ lazy_static! {
    );
    pub static ref CH_CONFIG: HashMap<String, String> = Message::create_output_filter_config(
        CURRENT_EXE_PATH
-            .join("config/channel_abbreviations.txt")
+            .join("rules/config/channel_abbreviations.txt")
            .to_str()
            .unwrap(),
        false,
--- a/src/main.rs
+++ b/src/main.rs
@@ -588,11 +588,17 @@ impl App {
                    continue;
                }

-                // target_eventids.txtでフィルタする。
+                // target_eventids.txtでイベントIDベースでフィルタする。
                let data = record_result.as_ref().unwrap().data.clone();
-                let timestamp = record_result.unwrap().timestamp;
+                if !self._is_target_event_id(&data)
+                    && !configs::CONFIG.read().unwrap().args.deep_scan
+                {
+                    continue;
+                }

-                if !self._is_target_event_id(&data) || !time_filter.is_target(&Some(timestamp)) {
+                // EventID側の条件との条件の混同を防ぐため時間でのフィルタリングの条件分岐を分離した
+                let timestamp = record_result.unwrap().timestamp;
+                if !time_filter.is_target(&Some(timestamp)) {
                    continue;
                }