From 08ca877cfc6dcb306ee3f97c2ae568dcb43f890c Mon Sep 17 00:00:00 2001 From: dafenghuang Date: Wed, 12 Feb 2025 11:37:51 +0800 Subject: [PATCH 1/2] feat: support parse png icon from pe file --- icon.go | 46 ++++++++++++++++++++++++++++++++++++++++++++++ icon_test.go | 30 ++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 icon.go create mode 100644 icon_test.go diff --git a/icon.go b/icon.go new file mode 100644 index 0000000..42a137c --- /dev/null +++ b/icon.go @@ -0,0 +1,46 @@ +package pe + +import ( + "bytes" + "errors" + "image/png" +) + +func (pe *File) ParsePngIcon() ([]byte, error) { + var iconEntry *ResourceDirectoryEntry + for _, e := range pe.Resources.Entries { + if e.ID != RTIcon { + continue + } + if len(e.Directory.Entries) == 0 { + return nil, errors.New("no entries found in resource directory") + } + iconEntry = &e + break + } + if iconEntry == nil { + return nil, errors.New("no icon found in resource directory") + } + + for _, iconItem := range iconEntry.Directory.Entries { + if len(iconItem.Directory.Entries) == 0 { + continue + } + + iconData := &iconItem.Directory.Entries[0] + + offset, size := pe.GetOffsetFromRva(iconData.Data.Struct.OffsetToData), iconData.Data.Struct.Size + + b, err := pe.ReadBytesAtOffset(offset, size) + if err != nil { + return nil, err + } + + _, err = png.Decode(bytes.NewBuffer(b)) + if err != nil { + continue + } + return b, nil + } + return nil, errors.New("no valid png icon found") +} diff --git a/icon_test.go b/icon_test.go new file mode 100644 index 0000000..3c6fa92 --- /dev/null +++ b/icon_test.go @@ -0,0 +1,30 @@ +package pe + +import ( + "os" + "testing" +) + +func Test_ParseIcon(t *testing.T) { + file, err := New(os.Getenv("PE_FILE"), &Options{}) + if err != nil { + t.Errorf("open file failed, err %v", err) + return + } + + err = file.Parse() + if err != nil { + t.Errorf("parse file failed, err %v", err) + return + } + + iconBytes, err := file.ParsePngIcon() + if err != nil { + t.Errorf("parse icon failed, err %v", err) + return + } + + os.WriteFile("test.png", iconBytes, 0644) + + t.Logf("length %d", len(iconBytes)) +} From 4e5376d70f8ba0678e77ac6576c605ae5f3d65b8 Mon Sep 17 00:00:00 2001 From: dafenghuang Date: Wed, 26 Feb 2025 11:01:20 +0800 Subject: [PATCH 2/2] fix: support bip file --- go.mod | 5 +- go.sum | 54 +++++++++++++++++++++- icon.go | 127 ++++++++++++++++++++++++++++++++++++++++++++++++--- icon_test.go | 36 +++++++++++++-- 4 files changed, 208 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index c9dc3b4..cd936bb 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,9 @@ go 1.15 require ( github.com/edsrzf/mmap-go v1.1.0 + github.com/gabriel-vasile/mimetype v1.4.8 + github.com/mat/besticon v3.12.0+incompatible github.com/secDre4mer/pkcs7 v0.0.0-20240322103146-665324a4461d - golang.org/x/text v0.7.0 + golang.org/x/image v0.24.0 // indirect + golang.org/x/text v0.22.0 ) diff --git a/go.sum b/go.sum index ee4e201..48e94e0 100644 --- a/go.sum +++ b/go.sum @@ -1,31 +1,81 @@ github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ= github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= +github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= +github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/mat/besticon v3.12.0+incompatible h1:1KTD6wisfjfnX+fk9Kx/6VEZL+MAW1LhCkL9Q47H9Bg= +github.com/mat/besticon v3.12.0+incompatible/go.mod h1:mA1auQYHt6CW5e7L9HJLmqVQC8SzNk2gVwouO0AbiEU= github.com/secDre4mer/pkcs7 v0.0.0-20240322103146-665324a4461d h1:RQqyEogx5J6wPdoxqL132b100j8KjcVHO1c0KLRoIhc= github.com/secDre4mer/pkcs7 v0.0.0-20240322103146-665324a4461d/go.mod h1:PegD7EVqlN88z7TpCqH92hHP+GBpfomGCCnw1PFtNOA= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ= +golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/icon.go b/icon.go index 42a137c..e9c19f6 100644 --- a/icon.go +++ b/icon.go @@ -2,11 +2,50 @@ package pe import ( "bytes" + "encoding/binary" "errors" + "fmt" + "image" + _ "image/jpeg" "image/png" + + "github.com/gabriel-vasile/mimetype" ) -func (pe *File) ParsePngIcon() ([]byte, error) { +// ParseIconToPng 解析icon，并转换为png +func (pe *File) ParseIconToPng() ([]byte, error) { + iconDataList, err := pe.ParseIcon() + if err != nil { + return nil, err + } + var maxIconData []byte + for _, data := range iconDataList { + if mimetype.Detect(data).Is("image/png") { + return data, nil + } + if len(data) > len(maxIconData) { + maxIconData = data + } + } + + // BIP file + if bytes.HasPrefix(maxIconData, []byte{0x28, 0x00, 0x00, 0x00}) { + return BIPToPNG(maxIconData) + } + + img, _, err := image.Decode(bytes.NewReader(maxIconData)) + if err != nil { + return nil, err + } + result := bytes.NewBuffer(nil) + err = png.Encode(result, img) + if err != nil { + return nil, err + } + return result.Bytes(), nil +} + +func (pe *File) ParseIcon() ([][]byte, error) { var iconEntry *ResourceDirectoryEntry for _, e := range pe.Resources.Entries { if e.ID != RTIcon { @@ -22,6 +61,8 @@ func (pe *File) ParsePngIcon() ([]byte, error) { return nil, errors.New("no icon found in resource directory") } + iconDataList := make([][]byte, 0) + for _, iconItem := range iconEntry.Directory.Entries { if len(iconItem.Directory.Entries) == 0 { continue @@ -36,11 +77,83 @@ func (pe *File) ParsePngIcon() ([]byte, error) { return nil, err } - _, err = png.Decode(bytes.NewBuffer(b)) - if err != nil { - continue - } - return b, nil + iconDataList = append(iconDataList, b) + } + return iconDataList, nil +} + +// BIP文件头结构 +const ( + headerSize = 40 + magicNumberSize = 4 +) + +// BIPToPNG BIP转PNG处理函数 +func BIPToPNG(bipData []byte) ([]byte, error) { + // 检查BIP文件头（示例中的magic number） + if !bytes.HasPrefix(bipData, []byte{0x28, 0x00, 0x00, 0x00}) { + return nil, fmt.Errorf("invalid bip file") // 或返回错误 + } + + // 解析宽高（小端序） + width := binary.LittleEndian.Uint32(bipData[magicNumberSize : magicNumberSize+4]) + height := binary.LittleEndian.Uint32(bipData[magicNumberSize+4 : headerSize]) + + bipData = convertToRGBA(bipData, int(width), int(height)) + + // 创建RGBA图像 + img := image.NewRGBA(image.Rect(0, 0, int(width), int(height))) + copy(img.Pix, bipData[headerSize:]) // 跳过文件头 + + // 计算裁剪区域（优先保留下半部分） + cropped := img.SubImage(image.Rect( + 0, + int(width), + int(width), + 0, + )).(*image.RGBA) + + flipImageVertically(cropped) + + buf := bytes.NewBuffer(nil) + + err := png.Encode(buf, cropped) + if err != nil { + return nil, fmt.Errorf("fail to encode PNG image: %w", err) + } + return buf.Bytes(), nil +} + +// 垂直翻转图像函数 +func flipImageVertically(img *image.RGBA) { + height := img.Rect.Dy() + stride := img.Stride + pix := img.Pix + + // 创建行缓冲区 + lineBuffer := make([]byte, stride) + + // 遍历上半部分图像 + for y := 0; y < height/2; y++ { + // 计算上下行位置 + top := y * stride + bottom := (height - 1 - y) * stride + + // 交换两行像素 + copy(lineBuffer, pix[top:top+stride]) // 暂存上行 + copy(pix[top:top+stride], pix[bottom:bottom+stride]) // 下行复制到上行 + copy(pix[bottom:bottom+stride], lineBuffer) // 缓冲区复制到下行 + } +} + +func convertToRGBA(data []byte, width, height int) []byte { + output := make([]byte, len(data)) + for i := 0; i < len(data); i += 4 { + // BGR → RGB 转换 + output[i] = data[i+2] // R + output[i+1] = data[i+1] // G + output[i+2] = data[i] // B + output[i+3] = data[i+3] // A } - return nil, errors.New("no valid png icon found") + return output } diff --git a/icon_test.go b/icon_test.go index 3c6fa92..41e386b 100644 --- a/icon_test.go +++ b/icon_test.go @@ -1,6 +1,7 @@ package pe import ( + "bytes" "os" "testing" ) @@ -12,19 +13,46 @@ func Test_ParseIcon(t *testing.T) { return } + defer func() { + _ = file.Close() + }() + err = file.Parse() if err != nil { t.Errorf("parse file failed, err %v", err) return } - iconBytes, err := file.ParsePngIcon() + data, err := file.ParseIconToPng() if err != nil { - t.Errorf("parse icon failed, err %v", err) + t.Errorf("parse file failed, err %v", err) return } - os.WriteFile("test.png", iconBytes, 0644) + _ = os.WriteFile("test.png", data, 0644) +} + +func TestBIPToPNGWithFile(t *testing.T) { + // 读取测试文件 + bipData, err := os.ReadFile("temp.bip") + if err != nil { + t.Fatalf("fail to read bip file: %v", err) + } + + // 验证BIP文件头 + if !bytes.HasPrefix(bipData, []byte{0x28, 0x00, 0x00, 0x00}) { + t.Fatal("invalid bip header") + } - t.Logf("length %d", len(iconBytes)) + // 设置测试参数 + const ( + outputFile = "temp_test.png" + ) + + // 执行转换 + if data, err := BIPToPNG(bipData); err != nil { + t.Fatalf("convert bip to png failed: %v", err) + } else { + _ = os.WriteFile(outputFile, data, 0644) + } }