!140 添加help

Merge pull request !140 from 宋帮诚晋/master

src/genmai/ArgParser/ParameterParser.go

@@ -12,7 +12,7 @@ import(
 	)
 
 var Num int
-func ParameterParser(sSystem string,sKernel string,sWeb string,sBaseLine string,sAll string,PoolStatNum int,ParserNum int,Update string ,IP string){
+func ParameterParser(sSystem string,sKernel string,sWeb string,sBaseLine string,sAll string,PoolStatNum int,ParserNum int,Update string ,IP string,help string){
     Request:=make(map[string]string)
     var ipCheck string
     ipList :=  make([]string,0)
@@ -97,7 +97,6 @@ func ParameterParser(sSystem string,sKernel string,sWeb string,sBaseLine string,
             Request["baseline"] = sBaseLine
         }else{
             fmt.Println("Only allow all")
-            flag.PrintDefaults()
             return
         }
     }
@@ -108,13 +107,16 @@ func ParameterParser(sSystem string,sKernel string,sWeb string,sBaseLine string,
             return
         }else{
             fmt.Println("The update process does not allow other processes")
-            flag.PrintDefaults()
             return
         }
     }
-    if sSystem=="false"&&sKernel=="false"&&sWeb=="false"&&sBaseLine=="false"&&sAll!="true"&&Update!="true"{
-        fmt.Println("error")
+
+    if help=="true"{
         flag.PrintDefaults()
+    }
+
+    if sSystem=="false"&&sKernel=="false"&&sWeb=="false"&&sBaseLine=="false"&&sAll!="true"&&Update!="true"&&help!="true"{
+        fmt.Println("err,Please enter parameters")
         return
     }
 
@@ -179,6 +181,7 @@ func WKPWD(WKPWD string ,PWDList []string){
             }
         }
         genmai.PythonParser(PWD)
+        fmt.Println("弱密码已生成")
     }
     return
 }

src/genmai/log.go

@@ -8,7 +8,7 @@ import (
 func LogInit() {
     // 获取日志文件句柄
     // 以 只写入文件|没有时创建|文件尾部追加 的形式打开这个文件
-    logFile, err := os.OpenFile(`./logfile`, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+    logFile, err := os.OpenFile(`../data/log/logfile`, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
     if err != nil {
         panic(err)
     }

src/main.go

@@ -59,6 +59,8 @@ func main(){
         return
     }
 
+    Help := flag.Bool("help", false,"")
+
     //识别参数，执行模块
     flag.IntVar(&vul.ParserNum, "poolNums", 100, "设置协程的数量，默认数量为0，最大数量为1000")
     flag.StringVar(&vul.Web, "web", "false", "使用web漏洞的验证模块，可联合其他模块使用")
@@ -96,6 +98,8 @@ func main(){
     vul.Update=strconv.FormatBool(*Update)
     vul.RemoteAssessment=strconv.FormatBool(*RA)
     vul.WKPWD=strconv.FormatBool(*WK)
+    help:=strconv.FormatBool(*Help)
+
     //是否开启远程检测
     if vul.RemoteAssessment=="true"{
         checkResult:=ArgParser.RemoteArgParser(RAV.SSHHost,RAV.SSHUser,RAV.SSHPassword)
@@ -104,13 +108,12 @@ func main(){
             fmt.Println("不允许登录root/administrator用户进行验证")
             log.Println("不允许登录root/administrator用户进行验证")
         }else if checkResult=="false"{
-            ArgParser.ParameterParser(vul.System,vul.Kernel,vul.Web,vul.BaseLine,sAll,vul.PoolStatNum,vul.ParserNum,vul.Update,vul.IP)
+            ArgParser.ParameterParser(vul.System,vul.Kernel,vul.Web,vul.BaseLine,sAll,vul.PoolStatNum,vul.ParserNum,vul.Update,vul.IP,help)
         }
 
     }else{
         ArgParser.WKPWD(vul.WKPWD,PWDList[:])
-        return
-        ArgParser.ParameterParser(vul.System,vul.Kernel,vul.Web,vul.BaseLine,sAll,vul.PoolStatNum,vul.ParserNum,vul.Update,vul.IP)
+        ArgParser.ParameterParser(vul.System,vul.Kernel,vul.Web,vul.BaseLine,sAll,vul.PoolStatNum,vul.ParserNum,vul.Update,vul.IP,help)
     }
     return
     ///////////////////////////////

src/test.go

@@ -1,7 +0,0 @@
-package main
-import (
-	"main/genmai"
-)
-func main(){
-	genmai.PythonParser()
-}

src/tools/WeakPwdGeneration.py

@@ -2,7 +2,7 @@ import itertools
 import argparse
 
 string = ''
-f = open('dic.txt', 'a')
+f = open('../data/dir/dic.txt', 'a')
  
  
 def listtostring(list):