diff --git a/tools/release/README.md b/tools/release/README.md index f075e19723cf206564799c23b650c7029714b269..1e1d1648b5b36db4d3ae97641848dab20de9867f 100644 --- a/tools/release/README.md +++ b/tools/release/README.md @@ -21,14 +21,20 @@ ## 2.1 适用于Anolis 8 -【1】python3，并安装第三方库：`pip3 install PyYAML==5.4.1` 以及`pip3 install PyPDF2` +【1】python3，并安装第三方库：`pip3 install PyYAML==5.4.1` 以及`pip3 install PyPDF2==2.12.1` + +![image-20230328152252322](./example_images/安装第三方库.png) 【2】依赖pandoc，`yum install -y pandoc` +![image-20230328152601576](./example_images/安装pandoc.png) + 【3】依赖Texlive，安装详见[Texlive_install.md](https://gitee.com/anolis/security-benchmark/blob/master/tools/release/Texlive_install.md) 【4】配置字体. `source config_zh_font.sh` +![image-20230328152837247](./example_images/配置字体.png) + ## 2.1 适用于Windows 10 【1】python3（测试环境为3.7），并安装第三方库：PyYAML和PyPDF2 @@ -101,4 +107,10 @@ ./addPDFCover.py cover.pdf pdf/converesult.pdf pdf/Anolis_OS_Server_8_Security_Best_Practices_v1.0.0.pdf ``` +- 代码执行 + +![img](./example_images/添加封面-代码执行.png) + +- 最终效果 +![img](./example_images/最终效果.png) diff --git a/tools/release/Texlive_install.md b/tools/release/Texlive_install.md index 75d823d85ab7907c8f76e6ee8a9c3ab8fd99fbd4..d7772392492b47cedafebca33bd93eccc3a15f59 100644 --- a/tools/release/Texlive_install.md +++ b/tools/release/Texlive_install.md @@ -17,6 +17,8 @@ tex -v xelatex -v ``` +![image-20230328153455993](./example_images/texlive-验证版本.png) + # 2 windows10下安装Texlive Windows下是使用texlive的iso文件进行安装的 diff --git "a/tools/release/example_images/texlive-\351\252\214\350\257\201\347\211\210\346\234\254.png" "b/tools/release/example_images/texlive-\351\252\214\350\257\201\347\211\210\346\234\254.png" new file mode 100644 index 0000000000000000000000000000000000000000..5aa6afe5a1891a585e3d2a1a54dd4f4746c99e17 Binary files /dev/null and "b/tools/release/example_images/texlive-\351\252\214\350\257\201\347\211\210\346\234\254.png" differ diff --git "a/tools/release/example_images/\345\256\211\350\243\205pandoc.png" "b/tools/release/example_images/\345\256\211\350\243\205pandoc.png" new file mode 100644 index 0000000000000000000000000000000000000000..7da87087cc805e7de0054e84ae612d48ccef2991 Binary files /dev/null and "b/tools/release/example_images/\345\256\211\350\243\205pandoc.png" differ diff --git "a/tools/release/example_images/\345\256\211\350\243\205\347\254\254\344\270\211\346\226\271\345\272\223.png" "b/tools/release/example_images/\345\256\211\350\243\205\347\254\254\344\270\211\346\226\271\345\272\223.png" new file mode 100644 index 0000000000000000000000000000000000000000..f6156b950de76054e6cd46ea0f3ff48f4e0b9811 Binary files /dev/null and "b/tools/release/example_images/\345\256\211\350\243\205\347\254\254\344\270\211\346\226\271\345\272\223.png" differ diff --git "a/tools/release/example_images/\346\234\200\347\273\210\346\225\210\346\236\234.png" "b/tools/release/example_images/\346\234\200\347\273\210\346\225\210\346\236\234.png" new file mode 100644 index 0000000000000000000000000000000000000000..ebb1f2d58fb66708d026b7f480aac063567e094c Binary files /dev/null and "b/tools/release/example_images/\346\234\200\347\273\210\346\225\210\346\236\234.png" differ diff --git "a/tools/release/example_images/\346\267\273\345\212\240\345\260\201\351\235\242-\344\273\243\347\240\201\346\211\247\350\241\214.png" "b/tools/release/example_images/\346\267\273\345\212\240\345\260\201\351\235\242-\344\273\243\347\240\201\346\211\247\350\241\214.png" new file mode 100644 index 0000000000000000000000000000000000000000..00f2d795395847d72f6c8f7779d9b9599d86e94e Binary files /dev/null and "b/tools/release/example_images/\346\267\273\345\212\240\345\260\201\351\235\242-\344\273\243\347\240\201\346\211\247\350\241\214.png" differ diff --git "a/tools/release/example_images/\351\205\215\347\275\256\345\255\227\344\275\223.png" "b/tools/release/example_images/\351\205\215\347\275\256\345\255\227\344\275\223.png" new file mode 100644 index 0000000000000000000000000000000000000000..c488d7a0fb4c108d82be4fe021c179deb1e4d7ec Binary files /dev/null and "b/tools/release/example_images/\351\205\215\347\275\256\345\255\227\344\275\223.png" differ diff --git a/tools/remediation-kits/README.md b/tools/remediation-kits/README.md index c34d5c9a6fe510c5bd4799bab5e4bcc65ad2e9d6..ef6f600ffb4629469c6773578d978ec9af37b513 100644 --- a/tools/remediation-kits/README.md +++ b/tools/remediation-kits/README.md @@ -32,6 +32,8 @@ Anolis OS release 8.* ``` +![image-20230328153718574](./img/系统版本.png) + 如系统不符合要求，暂无法执行此脚本 ## 3.2 确认加固项目 @@ -54,7 +56,10 @@ config文件建议存放在`security-benchmark/tools/remediation-kits/config`目 1.4 ... ``` +![img](./img/config文件.png) + 注意： + - 仅需填写对应加固脚本的项目编号即可，不需要填写完整脚本名称。 - 建议只添加未通过检查需要修复的项目编号，已通过检查的项目不需要重复执行加固。 - 默认配置文件(Anolis_security_benchmark_level1.config)内仅加入了需要修复的项目，剔除了系统初始状态已通过的项目。 @@ -73,4 +78,8 @@ sh run_Anolis_remediation_kit.sh # 指定config文件加固修复 sh run_Anolis_remediation_kit.sh -c [configfile] -``` \ No newline at end of file +``` + +![img](./img/脚本执行-1.png) + +![img](./img/脚本执行-2.png) \ No newline at end of file diff --git "a/tools/remediation-kits/img/config\346\226\207\344\273\266.png" "b/tools/remediation-kits/img/config\346\226\207\344\273\266.png" new file mode 100644 index 0000000000000000000000000000000000000000..8fa734d8f4e9095db49cfdec4735664f16c767fb Binary files /dev/null and "b/tools/remediation-kits/img/config\346\226\207\344\273\266.png" differ diff --git "a/tools/remediation-kits/img/\347\263\273\347\273\237\347\211\210\346\234\254.png" "b/tools/remediation-kits/img/\347\263\273\347\273\237\347\211\210\346\234\254.png" new file mode 100644 index 0000000000000000000000000000000000000000..4c41ffdc8ff4924b26330af36d279970482f5ba6 Binary files /dev/null and "b/tools/remediation-kits/img/\347\263\273\347\273\237\347\211\210\346\234\254.png" differ diff --git "a/tools/remediation-kits/img/\350\204\232\346\234\254\346\211\247\350\241\214-1.png" "b/tools/remediation-kits/img/\350\204\232\346\234\254\346\211\247\350\241\214-1.png" new file mode 100644 index 0000000000000000000000000000000000000000..c13931a058c5d64aa5e93cab5dbaa04388f143b3 Binary files /dev/null and "b/tools/remediation-kits/img/\350\204\232\346\234\254\346\211\247\350\241\214-1.png" differ diff --git "a/tools/remediation-kits/img/\350\204\232\346\234\254\346\211\247\350\241\214-2.png" "b/tools/remediation-kits/img/\350\204\232\346\234\254\346\211\247\350\241\214-2.png" new file mode 100644 index 0000000000000000000000000000000000000000..bc06db95a99c2102bdbff71852280285e13a0518 Binary files /dev/null and "b/tools/remediation-kits/img/\350\204\232\346\234\254\346\211\247\350\241\214-2.png" differ diff --git a/tools/scanners/README.md b/tools/scanners/README.md index 215c887a5d597b66309885d78d6fd7e1f482ae80..c9f2914c01044b1acec337e5a16c97e62e3ba0c0 100644 --- a/tools/scanners/README.md +++ b/tools/scanners/README.md @@ -34,6 +34,8 @@ Anolis OS release 8.* 如系统不符合要求，暂无法执行此脚本 +![系统版本](./img/系统版本.png) + ## 3.2 确认扫描项目 默认使用config文件夹下的`Anolis_security_benchmark_level1.config`中的扫描项目 @@ -54,7 +56,10 @@ config文件建议存放在`security-benchmark/tools/scanners/config`目录下 1.4 ... ``` +![img](./img/查看config文件.png) + 注意： + - 仅需填写对应扫描脚本的项目编号即可，不需要填写完整脚本名称。 - 默认配置文件(Anolis_security_benchmark_level1.config)内加入了已发布的benchmark中安全等级为level-1且有扫描脚本的所有扫描项目。 - 高等级的config文件内，默认包含了低等级的项目。如：level-2 = (level-1 + level-2)、level-3 = (level-1 + level-2 + level-3)、level-4 = (level-1 + level-2 + level-3 + level-4)。 @@ -75,4 +80,8 @@ sh run_Anolis_scanners.sh -l [1-4] # 指定config文件扫描 sh run_Anolis_scanners.sh -c [configfile] -``` \ No newline at end of file +``` + +![img](./img/脚本执行-1.png) + +![img](./img/脚本执行-2.png) \ No newline at end of file diff --git "a/tools/scanners/img/\346\237\245\347\234\213config\346\226\207\344\273\266.png" "b/tools/scanners/img/\346\237\245\347\234\213config\346\226\207\344\273\266.png" new file mode 100644 index 0000000000000000000000000000000000000000..05558e7b2f9bf06e1c8a66bca2de4c970963c467 Binary files /dev/null and "b/tools/scanners/img/\346\237\245\347\234\213config\346\226\207\344\273\266.png" differ diff --git "a/tools/scanners/img/\347\263\273\347\273\237\347\211\210\346\234\254.png" "b/tools/scanners/img/\347\263\273\347\273\237\347\211\210\346\234\254.png" new file mode 100644 index 0000000000000000000000000000000000000000..4c41ffdc8ff4924b26330af36d279970482f5ba6 Binary files /dev/null and "b/tools/scanners/img/\347\263\273\347\273\237\347\211\210\346\234\254.png" differ diff --git "a/tools/scanners/img/\350\204\232\346\234\254\346\211\247\350\241\214-1.png" "b/tools/scanners/img/\350\204\232\346\234\254\346\211\247\350\241\214-1.png" new file mode 100644 index 0000000000000000000000000000000000000000..518eaf1ab1aaf498eee219ae5d4e4676e34ef13e Binary files /dev/null and "b/tools/scanners/img/\350\204\232\346\234\254\346\211\247\350\241\214-1.png" differ diff --git "a/tools/scanners/img/\350\204\232\346\234\254\346\211\247\350\241\214-2.png" "b/tools/scanners/img/\350\204\232\346\234\254\346\211\247\350\241\214-2.png" new file mode 100644 index 0000000000000000000000000000000000000000..1a68b837398ab21681bd8abb97a367fff9861d4a Binary files /dev/null and "b/tools/scanners/img/\350\204\232\346\234\254\346\211\247\350\241\214-2.png" differ