Skip to content

Commit

Permalink
合并冲突
Browse files Browse the repository at this point in the history
  • Loading branch information
cn-kali-team committed Jan 22, 2024
1 parent 1ec08b9 commit 56f2b41
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
9 changes: 5 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@

## [Unreleased] - ReleaseDate

## [2023.9.18] - 2024.1.6
## [2024.1.22] - 2024.1.22

### Fixes

- 修复指纹读取顺序,状态码更新
- 添加nuclei默认目录,无论有没有识别到指纹都使用该目录的插件验证漏洞,用于验证通用web漏洞。
- 需要在`--plugins`指定的目录下创建`default`文件夹,然后将通用的nuclei插件yaml复制到该文件夹。

## [2023.9.18] - 2024.1.5
## [2024.1.5] - 2024.1.5

### Fixes

- 从结果文件中读取目标和指纹,修复nuclei逻辑判断

## [2023.9.18] - 2023.12.22
## [2023.12.22] - 2023.12.22

### Fixes

Expand Down
5 changes: 4 additions & 1 deletion observer_ward/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ pub fn read_file_to_target(file_path: &str) -> HashSet<String> {
}
HashSet::from_iter([])
}

pub fn read_from_stdio() -> Result<HashSet<String>, io::Error> {
let (tx, rx) = std::sync::mpsc::channel::<String>();
let mut stdin = std::io::stdin();
Expand Down Expand Up @@ -575,7 +576,9 @@ pub async fn get_plugins_by_nuclei(
let mut exist_plugins: Vec<String> = Vec::new();
let use_tags = config.path.is_some();
let mut template_condition = Vec::new();
for name in wwr.name.iter() {
let mut default_name = wwr.name.clone();
default_name.insert(String::from("default"));
for name in default_name.iter() {
if let Some(plugins_path) = &config.plugins {
let plugins_name_path = Path::new(plugins_path).join(name);
if plugins_name_path.exists() {
Expand Down

0 comments on commit 56f2b41

Please sign in to comment.