aflnet日志文件和kitty日志结果文件下载功能完成

fuzzIntegration/src/main/java/com/example/fuzzControll/constents/TableClassEnum.java

+package com.example.fuzzControll.constents;
+
+public enum TableClassEnum {
+    AFLNET("alfnetResult",1),
+    KITTY_PACKAGE("kittyPackageFile",2),
+    KITTY_RESULT("kittyResult",3);
+    private String tableName;
+    private int tableId;
+
+    private TableClassEnum(String tableName, int tableId) {
+        this.tableName = tableName;
+        this.tableId = tableId;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public int getTableId() {
+        return tableId;
+    }
+
+    public void setTableId(int tableId) {
+        this.tableId = tableId;
+    }
+}

fuzzIntegration/src/main/java/com/example/fuzzControll/controller/AlfnetControler.java → fuzzIntegration/src/main/java/com/example/fuzzControll/controller/AlfnetController.java

@@ -3,9 +3,11 @@ package com.example.fuzzControll.controller;
 import com.example.fuzzControll.exception.AflnetException;
 import com.example.fuzzControll.exception.BaseException;
 import com.example.fuzzControll.exception.CmdException;
+import com.example.fuzzControll.exception.MysqlException;
 import com.example.fuzzControll.pojo.vo.AjaxResult;
 import com.example.fuzzControll.pojo.vo.CmdStartParams;
 import com.example.fuzzControll.service.TestService;
+import com.example.fuzzControll.tools.GlobalParameters;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("/test")
-public class AlfnetControler {
+public class AlfnetController {
     @Autowired
     TestService service;
 
@@ -30,15 +32,16 @@ public class AlfnetControler {
     public AjaxResult start(@RequestBody final CmdStartParams cmdStartParams) {
         //todo 捕获子线程错误
         try {
-             new Thread(new Runnable() {
+            GlobalParameters.aflnetData.put("missionName", cmdStartParams.getProtopcol());
+            new Thread(new Runnable() {
                 @Override
                 public void run() {
                     service.testStart(cmdStartParams);
                 }
             }).start();
         } catch (Exception e) {
-            if(e instanceof AflnetException||e instanceof CmdException){
-                log.error(((BaseException)e).getDefaultMessage());
+            if (e instanceof AflnetException || e instanceof CmdException) {
+                log.error(((BaseException) e).getDefaultMessage());
             }
             return AjaxResult.error("测试启动失败！");
         }
@@ -55,6 +58,8 @@ public class AlfnetControler {
         } catch (AflnetException e) {
             log.error(e.getDefaultMessage());
             return AjaxResult.error("测试停止失败！");
+        } catch (MysqlException e){
+            log.error("File backup error: " + e.getMessage());
         }
         return AjaxResult.success("测试停止成功！");
     }

fuzzIntegration/src/main/java/com/example/fuzzControll/controller/dataController/FuzzLogController.java

+package com.example.fuzzControll.controller.dataController;
+
+import com.example.fuzzControll.pojo.vo.AflnetDataParams;
+import com.example.fuzzControll.pojo.vo.AjaxResult;
+import com.example.fuzzControll.pojo.vo.FuzzLogTransEntity;
+import com.example.fuzzControll.service.FuzzLogService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@RestController
+@RequestMapping("/log")
+@Slf4j
+public class FuzzLogController {
+    @Autowired
+    FuzzLogService FuzzLogService;
+
+    /**
+     * 下载对应任务的日志;不同任务返回数据类型不同，需要做个表来区分
+     */
+    @RequestMapping(value = "/download/{missionId}", method = RequestMethod.GET)
+    public FuzzLogTransEntity getFuzzLog(@PathVariable("missionId") int missionId) throws IOException {
+        try {
+            return FuzzLogService.getFuzzLog(missionId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

fuzzIntegration/src/main/java/com/example/fuzzControll/controller/dataController/MissionInfoController.java

+package com.example.fuzzControll.controller.dataController;
+
+import com.example.fuzzControll.mapper.MissionInfoMapper;
+import com.example.fuzzControll.pojo.vo.AjaxResult;
+import com.example.fuzzControll.pojo.vo.FuzzLogTransEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+@RestController
+@RequestMapping("/mission")
+@Slf4j
+public class MissionInfoController {
+    @Autowired
+    MissionInfoMapper missionInfoMapper;
+
+    /**
+     * 查看任务信息
+     */
+    @RequestMapping(value = "/getList", method = RequestMethod.GET)
+    public AjaxResult getMissionInfo() throws IOException {
+        try {
+            return AjaxResult.success(missionInfoMapper.selectMissionInfoList());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error("SelectMissionInfoList error!");
+        }
+    }
+}

fuzzIntegration/src/main/java/com/example/fuzzControll/mapper/KittyMapper.java

@@ -22,6 +22,8 @@ public interface KittyMapper {
 
     KittyPackageFile getKittyPackageFileById(int missionId);
 
+    KittyResult getKittyResultByMissionId(int missionId);
+
 
     /**
      * 查询kitty日志

fuzzIntegration/src/main/java/com/example/fuzzControll/mapper/MissionInfoMapper.java

+package com.example.fuzzControll.mapper;
+
+import com.example.fuzzControll.pojo.vo.MissionInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Mapper
+@Component("MissionInfoMapper")
+public interface MissionInfoMapper {
+
+    MissionInfo selectByMissionId(int missionId);
+    /**
+     * 查询任务信息列表
+     */
+    List<MissionInfo> selectMissionInfoList();
+    /**
+     * 查询当前任务Id
+     */
+    int selectTopMissionId();
+
+    void insertMission(MissionInfo missionInfo);
+}

fuzzIntegration/src/main/java/com/example/fuzzControll/pojo/vo/FuzzLogTransEntity.java

+package com.example.fuzzControll.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class FuzzLogTransEntity {
+    private byte[] file;
+    private String name;
+
+    public FuzzLogTransEntity(byte[] file, String name) {
+        this.file = file;
+        this.name = name;
+    }
+
+    public FuzzLogTransEntity() {
+    }
+}

fuzzIntegration/src/main/java/com/example/fuzzControll/pojo/vo/MissionInfo.java

+package com.example.fuzzControll.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class MissionInfo {
+    @JsonIgnore
+    private int id;
+    private int missionId;
+    @JsonIgnore
+    private int tableId;//返回数据忽略字段
+    private Date createTime;
+    private String missionName;
+
+    public MissionInfo() {
+    }
+
+    public MissionInfo(int id, int missionId, int tableId, Date createTime, String missionName) {
+        this.id = id;
+        this.missionId = missionId;
+        this.tableId = tableId;
+        this.createTime = createTime;
+        this.missionName = missionName;
+    }
+
+    public MissionInfo(int missionId, int tableId, Date createTime, String missionName) {
+        this.missionId = missionId;
+        this.tableId = tableId;
+        this.createTime = createTime;
+        this.missionName = missionName;
+    }
+}

fuzzIntegration/src/main/java/com/example/fuzzControll/service/AflnetPersistenceService.java

 package com.example.fuzzControll.service;
 
 public interface AflnetPersistenceService {
-    public int aflnetResultBackup(String filename);
+    public int aflnetResultBackup(String filename,String missionName);
     public void loadInFile(int missionId,String filePath);
 }

fuzzIntegration/src/main/java/com/example/fuzzControll/service/FuzzLogService.java

+package com.example.fuzzControll.service;
+
+import com.example.fuzzControll.pojo.vo.FuzzLogTransEntity;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public interface FuzzLogService {
+    FuzzLogTransEntity getFuzzLog(int missionId) throws IllegalAccessException;
+}

fuzzIntegration/src/main/java/com/example/fuzzControll/service/impl/AflnetPersistenceServiceImpl.java

 package com.example.fuzzControll.service.impl;
 
 import com.example.fuzzControll.conf.AflnetProperties;
+import com.example.fuzzControll.constents.TableClassEnum;
 import com.example.fuzzControll.exception.MysqlException;
 import com.example.fuzzControll.mapper.AflnetMapper;
+import com.example.fuzzControll.mapper.MissionInfoMapper;
 import com.example.fuzzControll.pojo.vo.AflnetResult;
 import com.example.fuzzControll.pojo.vo.KittyResult;
+import com.example.fuzzControll.pojo.vo.MissionInfo;
 import com.example.fuzzControll.service.AflnetPersistenceService;
 import com.example.fuzzControll.tools.FileTools;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
 
 @Slf4j
 @Service("AflnetPersistenceService")
@@ -18,13 +24,13 @@ public class AflnetPersistenceServiceImpl implements AflnetPersistenceService {
     AflnetMapper aflnetMapper;
     @Autowired
     AflnetProperties aflnetProperties;
+    @Autowired
+    MissionInfoMapper missionInfoMapper;
     FileTools fileTools = new FileTools();
 
     @Override
-    public int aflnetResultBackup(String filename) {
-        //todo 需要传入任务id
-        AflnetResult result = new AflnetResult(1, fileTools.fileReadAndTranstoBytes(aflnetProperties.getOutputPath(),filename), filename);
-        return aflnetMapper.aflnetOutputBackup(result);
+    public int aflnetResultBackup(String filename, String missionName) {
+        return mysqlTransaction(filename, missionName);
     }
 
     @Override
@@ -36,7 +42,15 @@ public class AflnetPersistenceServiceImpl implements AflnetPersistenceService {
             e.printStackTrace();
             throw new MysqlException("AflnetMapper.selectResultById() Error!");
         }
-        fileTools.loadFileInLocal(filePath, aflnetResult.getFileName(),aflnetResult.getFile());
+        fileTools.loadFileInLocal(filePath, aflnetResult.getFileName(), aflnetResult.getFile());
     }
 
+    @Transactional(rollbackFor = MysqlException.class)
+    public int mysqlTransaction(String filename,String missionName) {
+        int topMissionId = missionInfoMapper.selectTopMissionId() + 1;//获取最新的missionId
+        AflnetResult result = new AflnetResult(topMissionId, fileTools.fileReadAndTranstoBytes(aflnetProperties.getOutputPath(), filename), filename);
+        aflnetMapper.aflnetOutputBackup(result);//存入日志文件
+        missionInfoMapper.insertMission(new MissionInfo(topMissionId, TableClassEnum.AFLNET.getTableId(), new Date(), missionName));//插入任务信息
+        return 1;
+    }
 }

fuzzIntegration/src/main/java/com/example/fuzzControll/service/impl/FuzzLogServiceImpl.java

+package com.example.fuzzControll.service.impl;
+
+import com.example.fuzzControll.mapper.AflnetMapper;
+import com.example.fuzzControll.mapper.KittyMapper;
+import com.example.fuzzControll.mapper.MissionInfoMapper;
+import com.example.fuzzControll.pojo.vo.AflnetResult;
+import com.example.fuzzControll.pojo.vo.FuzzLogTransEntity;
+import com.example.fuzzControll.pojo.vo.KittyResult;
+import com.example.fuzzControll.pojo.vo.MissionInfo;
+import com.example.fuzzControll.service.FuzzLogService;
+import com.example.fuzzControll.tools.FileTools;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Slf4j
+@Service("FuzzLogService")
+public class FuzzLogServiceImpl implements FuzzLogService {
+    @Autowired
+    MissionInfoMapper missionInfoMapper;
+    @Autowired
+    AflnetMapper aflnetMapper;
+    @Autowired
+    KittyMapper kittyMapper;
+    FileTools fileTools = new FileTools();
+
+    @Override
+    public FuzzLogTransEntity getFuzzLog(int missionId) throws IllegalAccessException {
+        MissionInfo missionInfo = missionInfoMapper.selectByMissionId(missionId);
+        if (missionInfo == null) {
+            return null;
+        }
+        switch (missionInfo.getTableId()) {
+            case 1:
+                return downloadAflnetFile(missionInfo);
+//           case 2:return downloadKittyProtocalFile(missionInfo);
+            case 3:
+                return downloadKittyOtherMethodFile(missionInfo);
+            default:
+                throw new IllegalAccessException("Invalid mission!");
+        }
+    }
+
+    private FuzzLogTransEntity downloadKittyOtherMethodFile(MissionInfo missionInfo) {
+        KittyResult kittyResult = kittyMapper.getKittyResultByMissionId(missionInfo.getMissionId());
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(kittyResult.getResultError()).append(System.lineSeparator()).append(kittyResult.getResultOut());
+        return new FuzzLogTransEntity(buffer.toString().getBytes(), missionInfo.getMissionName()+".txt");
+    }
+
+    private FuzzLogTransEntity downloadAflnetFile(MissionInfo missionInfo) {
+        AflnetResult aflnetResult = aflnetMapper.selectResultById(missionInfo.getMissionId());
+        return new FuzzLogTransEntity(aflnetResult.getFile(), aflnetResult.getFileName());
+    }
+}

fuzzIntegration/src/main/java/com/example/fuzzControll/service/impl/GenerateMethodServiceImpl.java

@@ -27,7 +27,7 @@ public class GenerateMethodServiceImpl implements GenerateMethodService {
         if (cmd.isEmpty()) {
             throw new FuzzException("cmd is null ! The number of parameters does not match!");
         }
-        return cmdTools.runProgramCmdAndResult(cmd,"generate",missionId);
+        return cmdTools.runProgramCmdAndResult(cmd,"generate","Generate-"+testEntity.getTestClassName());
     }
 
     public String parseParameters(TestEntity testEntity) {

fuzzIntegration/src/main/java/com/example/fuzzControll/service/impl/MutationServiceImpl.java

@@ -29,7 +29,7 @@ class MutationServiceImpl implements MutationService {
         if (cmd.isEmpty()) {
             throw new FuzzException("cmd is null ! The number of parameters does not match!");
         }
-        return cmdTools.runProgramCmdAndResult(cmd,"mutation",missionId);
+        return cmdTools.runProgramCmdAndResult(cmd,"mutation","Mutation-"+testEntity.getTestClassName());
     }
 
     public String parseParameters(TestEntity testEntity) {

fuzzIntegration/src/main/java/com/example/fuzzControll/service/impl/ProtocolTemplateImpl.java

@@ -28,12 +28,12 @@ public class ProtocolTemplateImpl implements ProtocolTemplateService {
     @Override
     public Map<String, List<String>> generation(TestEntity testEntity,int missionId) throws FuzzException, CmdException {
         /*生成日志前先清除日志*/
-//        cmdTools.runCmd(CmdConstent.DELETE_FILE + GlobalParameters.kittyProperties.getLogOutPath(),"delete kittyLogs");
+        cmdTools.runCmd(CmdConstent.DELETE_FILE + GlobalParameters.kittyProperties.getLogOutPath(),"delete kittyLogs");
         String cmd = parseParameters(testEntity);
         if (cmd == null || cmd.equals("")) {
             throw new FuzzException("cmd is null ! The number of parameters does not match!");
         }
-        return cmdTools.runProgramCmdAndResult(cmd,"protocolTemplate",missionId);
+        return cmdTools.runProgramCmdAndResult(cmd,"protocolTemplate","ProtocolTemplate-"+testEntity.getTestClassName());
     }
 
     public String parseParameters(TestEntity testEntity) throws FuzzException {

fuzzIntegration/src/main/java/com/example/fuzzControll/service/impl/TestServiceImpl.java

@@ -63,7 +63,7 @@ public class TestServiceImpl implements TestService {
                     cmdTools.runCmd(CmdConstent.RUN_ZIP_FILE + fileZipName + " " + fileName, "zip file in testStart");
                     List<String> files = cmdTools.runCmd(CmdConstent.GET_FILE_NAME + aflnetProperties.getOutputPath(), "getSeedFiles");
                     while (files.contains(fileZipName) && flag == 0) {//当前存在压缩包才存入
-                        flag = aflnetPersistenceService.aflnetResultBackup(fileZipName);
+                        flag = aflnetPersistenceService.aflnetResultBackup(fileZipName,GlobalParameters.aflnetData.get("missionName"));
                     }
                     /*清除生成的文件*/
                     try {

fuzzIntegration/src/main/java/com/example/fuzzControll/service/impl/VulnerabilityTypeServiceImpl.java

@@ -26,7 +26,7 @@ public class VulnerabilityTypeServiceImpl implements VulnerabilityTypeService {
         if (cmd.isEmpty()) {
             throw new FuzzException("cmd is null ! The number of parameters does not match!");
         }
-        return cmdTools.runProgramCmdAndResult(cmd,"vulnerability",missionId);
+        return cmdTools.runProgramCmdAndResult(cmd,"vulnerability","Vulnerability-"+testEntity.getTestClassName());
     }
 
     public String parseParameters(TestEntity testEntity) {

fuzzIntegration/src/main/java/com/example/fuzzControll/tools/CmdTools.java

@@ -4,20 +4,22 @@ import com.alibaba.fastjson.JSONObject;
 import com.example.fuzzControll.conf.AflnetProperties;
 import com.example.fuzzControll.conf.SpringContextUtil;
 import com.example.fuzzControll.constents.CmdConstent;
+import com.example.fuzzControll.constents.TableClassEnum;
 import com.example.fuzzControll.exception.AflnetException;
 import com.example.fuzzControll.exception.CmdException;
+import com.example.fuzzControll.exception.MysqlException;
 import com.example.fuzzControll.mapper.KittyMapper;
-import com.example.fuzzControll.pojo.vo.CmdStartParams;
-import com.example.fuzzControll.pojo.vo.KittyResult;
-import com.example.fuzzControll.pojo.vo.TestReturnEntity;
+import com.example.fuzzControll.pojo.vo.*;
 import com.example.fuzzControll.service.AflnetPersistenceService;
 import com.example.fuzzControll.service.impl.websocketClientServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.swing.*;
 import java.io.*;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 //todo need modify
@@ -67,39 +69,31 @@ public class CmdTools {
      * 运行需要后台运行cmd
      * 将数据存入文件中
      */
-    public Map<String, List<String>> runProgramCmdAndResult(String cmd, String caller, int missionId) throws CmdException {
+    public Map<String, List<String>> runProgramCmdAndResult(String cmd, String caller, String missionName) throws CmdException {
         Map<String, List<String>> result = new HashMap();
         List<String> out = Collections.synchronizedList(new ArrayList<String>());
         List<String> error = Collections.synchronizedList(new ArrayList<String>());
         try {
-//            Process process = Runtime.getRuntime().exec(cmd);
-//            printMessageByProgramCmd(process.getInputStream(), out);
-//            printMessageByProgramCmd(process.getErrorStream(), error);
-//            process.waitFor();
+            Process process = Runtime.getRuntime().exec(cmd);
+            printMessageByProgramCmd(process.getInputStream(), out);
+            printMessageByProgramCmd(process.getErrorStream(), error);
+            process.waitFor();
         } catch (Exception e) {
             e.printStackTrace();
             throw new CmdException("run fuzz error !");
         }
+        out = out.stream().map(s -> s + System.lineSeparator()).collect(Collectors.toList());
+        error = error.stream().map(s -> s + System.lineSeparator()).collect(Collectors.toList());
         result.put("out", out);
         result.put("error", error);
         //todo 对于无法运行和数据较长的还需要观察
         /*新开一个线程存入数据*/
+        List<String> finalOut = out;
+        List<String> finalError = error;
         new Thread(new Runnable() {
             @Override
             public void run() {
-                try {
-                    /*kitty结果存入数据库*/
-                    KittyResult kittyResult = new KittyResult(missionId, out.toString(), error.toString());
-                    GlobalParameters.kittyMapper.kittyResultsBackup(kittyResult);
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    log.error("kitty backup error!");
-                }
-                /*kitty的协议模板方法的日志和数据包文件存入数据库*/
-                if (caller.equals("protocolTemplate")) {
-                    GlobalParameters.kittyFuzzPersistenceService.KittyPackagesBackup(missionId);
-                }
+                dataBackUpTransaction(caller, finalOut, finalError, missionName);
             }
         }).start();
         //todo 需要传入任务参数，后期再开发
@@ -306,4 +300,24 @@ public class CmdTools {
         return cmd.toString();
     }
 
+    @Transactional(rollbackFor = MysqlException.class)
+    public void dataBackUpTransaction(String caller, List<String> out, List<String> error, String missionName) {
+        int missionId = GlobalParameters.missionInfoMapper.selectTopMissionId() + 1;
+        try {
+            /*kitty结果存入数据库*/
+            KittyResult kittyResult = new KittyResult(missionId, out.toString(), error.toString());
+            GlobalParameters.kittyMapper.kittyResultsBackup(kittyResult);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("kitty backup error!");
+        }
+        /*kitty的协议模板方法的日志和数据包文件存入数据库*/
+        if (caller.equals("protocolTemplate")) {
+            GlobalParameters.kittyFuzzPersistenceService.KittyPackagesBackup(missionId);
+            GlobalParameters.missionInfoMapper.insertMission(new MissionInfo(missionId, 2, new Date(), missionName));
+        } else {
+            /*存入missionInfo信息*/
+            GlobalParameters.missionInfoMapper.insertMission(new MissionInfo(missionId, 3, new Date(), missionName));
+        }
+    }
 }
\ No newline at end of file

fuzzIntegration/src/main/java/com/example/fuzzControll/tools/FileTools.java

@@ -4,8 +4,12 @@ import com.example.fuzzControll.conf.AflnetProperties;
 import com.example.fuzzControll.conf.SpringContextUtil;
 import com.example.fuzzControll.exception.FileException;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 
 @Slf4j
@@ -81,4 +85,6 @@ public class FileTools {
             throw new FileException("Load file failed!");
         }
     }
-}
+
\ No newline at end of file
+
+}

fuzzIntegration/src/main/java/com/example/fuzzControll/tools/GlobalParameters.java

@@ -4,6 +4,7 @@ import com.example.fuzzControll.conf.AflnetProperties;
 import com.example.fuzzControll.conf.KittyProperties;
 import com.example.fuzzControll.conf.SpringContextUtil;
 import com.example.fuzzControll.mapper.KittyMapper;
+import com.example.fuzzControll.mapper.MissionInfoMapper;
 import com.example.fuzzControll.service.AflnetPersistenceService;
 import com.example.fuzzControll.service.KittyFuzzPersistenceService;
 
@@ -16,5 +17,5 @@ public class GlobalParameters {
     public static KittyFuzzPersistenceService kittyFuzzPersistenceService =(KittyFuzzPersistenceService) SpringContextUtil.getBean("KittyFuzzPersistenceService");
     public static AflnetProperties aflnetProperties = (AflnetProperties) SpringContextUtil.getBean("AflnetProperties");
     public static AflnetPersistenceService aflnetPersistenceService = (AflnetPersistenceService) SpringContextUtil.getBean("AflnetPersistenceService");
-
+    public static MissionInfoMapper missionInfoMapper = (MissionInfoMapper) SpringContextUtil.getBean("MissionInfoMapper");
 }

fuzzIntegration/src/main/resources/application.yml

@@ -5,6 +5,6 @@ spring:
     active: dev #默认为开发环境
 
 server:
-  port: 8103
+  port: 8104
 
 

fuzzIntegration/src/main/resources/mapper/KittyMapper.xml

@@ -20,7 +20,7 @@
     </resultMap>
 
     <sql id="selectKittyResult">
-        select id, missionId,resultOut, resultError from kittyResult;
+        select id, missionId,resultOut, resultError from kittyResult
     </sql>
     <sql id="selectKittyPackageFile">
         select id,missionId, kittyRecvFile, kittySendFile,kittyRecvFileName,kittySendFileName from kittyPackageFile;
@@ -39,5 +39,9 @@
         <include refid="selectKittyPackageFile"/>
         where missionId=#{missionId}
     </select>
+    <select id="getKittyResultByMissionId" resultType="com.example.fuzzControll.pojo.vo.KittyResult">
+        <include refid="selectKittyResult"/>
+        where missionId = #{missionId}
+    </select>
 
 </mapper>
\ No newline at end of file

fuzzIntegration/src/main/resources/mapper/MissionInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.fuzzControll.mapper.MissionInfoMapper">
+
+    <resultMap type="com.example.fuzzControll.pojo.vo.MissionInfo" id="MissionInfo">
+        <result property="id"    column="id"    />
+        <result property="missionId" column="missionId" />
+        <result property="tableId"    column="tableId"    />
+        <result property="createTime"    column="createTime"    />
+        <result property="missionName" column="missionName" />
+    </resultMap>
+
+    <sql id="selectMissionInfo">
+        select id, missionId,tableId, createTime,missionName from missionIdInfo
+    </sql>
+    <insert id="insertMission">
+        insert into missionIdInfo(missionId,tableId, createTime,missionName) values(#{missionId}, #{tableId},#{createTime}, #{missionName})
+    </insert>
+    <select id="selectByMissionId" resultMap="MissionInfo">
+        <include refid="selectMissionInfo"/>
+        where missionId = #{missionId}
+    </select>
+    <select id="selectMissionInfoList" resultType="com.example.fuzzControll.pojo.vo.MissionInfo">
+        <include refid="selectMissionInfo"/>
+    </select>
+    <select id="selectTopMissionId" resultType="java.lang.Integer">
+        select IFNULL((select missionId from missionIdInfo order by missionId desc limit 1),0) as missionId;
+    </select>
+
+</mapper>
\ No newline at end of file

fuzzbackendmaster/src/main/java/com/example/fuzzbackendmaster/controller/FuzzLogController.java

+package com.example.fuzzbackendmaster.controller;
+
+import com.example.fuzzbackendmaster.service.FuzzIntegrationFileApi;
+import com.example.fuzzbackendmaster.service.FuzzLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@RestController
+@RequestMapping("/log")
+public class FuzzLogController {
+    @Autowired
+    FuzzLogService fuzzLogService;
+    /**
+     * 下载对应任务的日志;不同任务返回数据类型不同，需要做个表来区分
+     */
+    @RequestMapping(value = "/download/{missionId}", method = RequestMethod.GET)
+    public void getFuzzLog(@PathVariable("missionId") int missionId,HttpServletResponse response) throws IOException {
+        try {
+            fuzzLogService.getFuzzLog(missionId,response);
+        } catch (Exception e) {
+            e.printStackTrace();
+            response.sendError(500, "Download failed!");
+        }
+    }
+}

fuzzbackendmaster/src/main/java/com/example/fuzzbackendmaster/controller/MissionInfoController.java

+package com.example.fuzzbackendmaster.controller;
+
+import com.example.fuzzbackendmaster.pojo.vo.AjaxResult;
+import com.example.fuzzbackendmaster.service.FuzzIntegrationFileApi;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+@RestController
+@RequestMapping("/log")
+public class MissionInfoController {
+    @Autowired
+    FuzzIntegrationFileApi fuzzIntegrationFileApi;
+
+    /**
+     * 查看任务信息
+     */
+    @RequestMapping(value = "/getList", method = RequestMethod.GET)
+    public AjaxResult getMissionInfo() throws IOException {
+        return fuzzIntegrationFileApi.selectMissionInfoList();
+    }
+}

fuzzbackendmaster/src/main/java/com/example/fuzzbackendmaster/pojo/vo/FuzzLogTransEntity.java

+package com.example.fuzzbackendmaster.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class FuzzLogTransEntity {
+    private byte[] file;
+    private String name;
+
+    public FuzzLogTransEntity(byte[] file, String name) {
+        this.file = file;
+        this.name = name;
+    }
+
+    public FuzzLogTransEntity() {
+    }
+}

fuzzbackendmaster/src/main/java/com/example/fuzzbackendmaster/service/FuzzIntegrationFileApi.java

@@ -2,6 +2,7 @@ package com.example.fuzzbackendmaster.service;
 
 import com.example.fuzzbackendmaster.pojo.vo.AjaxResult;
 import com.example.fuzzbackendmaster.pojo.vo.CmdStartParams;
+import com.example.fuzzbackendmaster.pojo.vo.FuzzLogTransEntity;
 import com.example.fuzzbackendmaster.pojo.vo.TestEntity;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -10,6 +11,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 
@@ -56,15 +59,29 @@ public interface FuzzIntegrationFileApi {
 
     @RequestMapping(value = "/kittyServer/templateInfo", method = RequestMethod.GET)
     AjaxResult getTemplateInfo();
+
     @RequestMapping(value = "/kittyServer/stages", method = RequestMethod.GET)
     AjaxResult getStages();
+
     @RequestMapping(value = "/kittyServer/report", method = RequestMethod.GET)
     AjaxResult getReport();
+
     /**
      * websocket
      */
     @RequestMapping(value = "/websocket/connect", method = RequestMethod.GET)
     void connect();
+
     @RequestMapping(value = "/websocket/disConnect", method = RequestMethod.GET)
     void disconnect();
+
+    @RequestMapping(value = "/log/download/{missionId}", method = RequestMethod.GET)
+    FuzzLogTransEntity getFuzzLog(@PathVariable("missionId") int missionId);
+
+    /**
+     * 查询任务信息
+     * @return
+     */
+    @RequestMapping(value = "/mission/getList", method = RequestMethod.GET)
+    AjaxResult selectMissionInfoList();
 }

fuzzbackendmaster/src/main/java/com/example/fuzzbackendmaster/service/FuzzLogService.java

+package com.example.fuzzbackendmaster.service;
+
+import javax.servlet.http.HttpServletResponse;
+
+public interface FuzzLogService {
+    void getFuzzLog(int missionId, HttpServletResponse response) throws IllegalAccessException;
+}

fuzzbackendmaster/src/main/java/com/example/fuzzbackendmaster/service/impl/FuzzLogServiceImpl.java

+package com.example.fuzzbackendmaster.service.impl;
+
+import com.example.fuzzbackendmaster.pojo.vo.FuzzLogTransEntity;
+import com.example.fuzzbackendmaster.service.FuzzIntegrationFileApi;
+import com.example.fuzzbackendmaster.service.FuzzLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+
+@Service("FuzzLogService")
+public class FuzzLogServiceImpl implements FuzzLogService {
+    @Autowired
+    FuzzIntegrationFileApi fuzzIntegrationFileApi;
+
+    @Override
+    public void getFuzzLog(int missionId, HttpServletResponse response) throws IllegalAccessException {
+        FuzzLogTransEntity fuzzLogTransEntity = fuzzIntegrationFileApi.getFuzzLog(missionId);
+        if (fuzzLogTransEntity == null && fuzzLogTransEntity.getFile() == null) {
+            throw new IllegalStateException();
+        }
+        downloadFile(fuzzLogTransEntity.getName(), fuzzLogTransEntity.getFile(), response);
+    }
+
+    /**
+     * 浏览器前端下载后台文件,文件为二进制格式
+     */
+    public void downloadFile(String fileName, byte[] file, HttpServletResponse response) {
+        if (fileName != null && !"".equals(fileName)) {
+            if (file != null && file.length != 0) {
+                response.setContentType("application/force-download");// 设置强制下载不打开
+                response.addHeader("Content-Disposition", "attachment;fileName=" + fileName);// 设置文件名
+                try (OutputStream os = response.getOutputStream();) {
+                    os.write(file, 0, file.length);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+}

fuzzbackendmaster/src/main/java/com/example/fuzzbackendmaster/utils/FileTools.java

+package com.example.fuzzbackendmaster.utils;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+
+public class FileTools {
+    /**
+     * 浏览器前端下载后台文件,文件为二进制格式
+     */
+    public void downloadFile(String fileName, byte[] file,  HttpServletResponse response) {
+        if (fileName != null && !fileName.equals("")) {
+            if (file != null && file.length != 0) {
+                response.setContentType("application/force-download");// 设置强制下载不打开
+                response.addHeader("Content-Disposition", "attachment;fileName=" + fileName);// 设置文件名
+                try (OutputStream os = response.getOutputStream();) {
+                    os.write(file, 0, file.length);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+}

fuzzbackendmaster/src/main/resources/application.yml

@@ -5,6 +5,6 @@ spring:
     active: dev #默认为开发环境
 
 server:
-  port: 8104
+  port: 8103