mirror of
https://github.com/shadow1ng/fscan.git
synced 2026-09-24 12:11:52 +08:00
## 架构重构
- 全局变量消除,迁移至 Config/State 对象
- SMB 插件融合(smb/smb2/smbghost/smbinfo)
- 服务探测重构,实现 Nmap 风格 fallback 机制
- 输出系统重构,TXT 实时刷盘 + 双写机制
- i18n 框架升级至 go-i18n
## 性能优化
- 正则表达式预编译
- 内存优化 map[string]struct{}
- 并发指纹匹配
- SOCKS5 连接复用
- 滑动窗口调度 + 自适应线程池
## 新功能
- Web 管理界面
- 多格式 POC 适配(xray/afrog)
- 增强指纹库(3139条)
- Favicon hash 指纹识别
- 插件选择性编译(Build Tags)
- fscan-lab 靶场环境
- 默认端口扩展(62→133)
## 构建系统
- 添加 no_local tag 支持排除本地插件
- 多版本构建:fscan/fscan-nolocal/fscan-web
- CI 添加 snapshot 模式支持仅测试构建
## Bug 修复
- 修复 120+ 个问题,包括 RDP panic、批量扫描漏报、
JSON 输出格式、Redis 检测、Context 超时等
## 测试增强
- 单元测试覆盖率 74-100%
- 并发安全测试
- 集成测试(Web/端口/服务/SSH/ICMP)
152 lines
3.0 KiB
Go
152 lines
3.0 KiB
Go
package core
|
|
|
|
import (
|
|
"encoding/binary"
|
|
"github.com/shadow1ng/fscan/mylib/grdp/glog"
|
|
"io"
|
|
)
|
|
|
|
type ReadBytesComplete func(result []byte, err error)
|
|
|
|
func StartReadBytes(len int, r io.Reader, cb ReadBytesComplete) {
|
|
glog.Debug("create len:", len)
|
|
b := make([]byte, len)
|
|
go func() {
|
|
_, err := io.ReadFull(r, b)
|
|
//glog.Debug("StartReadBytes Get", n, "Bytes:", hex.EncodeToString(b))
|
|
cb(b, err)
|
|
}()
|
|
}
|
|
|
|
func ReadBytes(len int, r io.Reader) ([]byte, error) {
|
|
b := make([]byte, len)
|
|
length, err := io.ReadFull(r, b)
|
|
return b[:length], err
|
|
}
|
|
|
|
func ReadByte(r io.Reader) (byte, error) {
|
|
b, err := ReadBytes(1, r)
|
|
return b[0], err
|
|
}
|
|
|
|
func ReadUInt8(r io.Reader) (uint8, error) {
|
|
b, err := ReadBytes(1, r)
|
|
if err != nil {
|
|
return uint8(0), err
|
|
} else {
|
|
return uint8(b[0]), err
|
|
}
|
|
}
|
|
|
|
func ReadUint16LE(r io.Reader) (uint16, error) {
|
|
b := make([]byte, 2)
|
|
_, err := io.ReadFull(r, b)
|
|
if err != nil {
|
|
return 0, nil
|
|
}
|
|
return binary.LittleEndian.Uint16(b), nil
|
|
}
|
|
|
|
func ReadUint16BE(r io.Reader) (uint16, error) {
|
|
b := make([]byte, 2)
|
|
_, err := io.ReadFull(r, b)
|
|
if err != nil {
|
|
return 0, nil
|
|
}
|
|
return binary.BigEndian.Uint16(b), nil
|
|
}
|
|
|
|
func ReadUInt32LE(r io.Reader) (uint32, error) {
|
|
b := make([]byte, 4)
|
|
_, err := io.ReadFull(r, b)
|
|
if err != nil {
|
|
return 0, nil
|
|
}
|
|
return binary.LittleEndian.Uint32(b), nil
|
|
}
|
|
|
|
func ReadUInt32BE(r io.Reader) (uint32, error) {
|
|
b := make([]byte, 4)
|
|
_, err := io.ReadFull(r, b)
|
|
if err != nil {
|
|
return 0, nil
|
|
}
|
|
return binary.BigEndian.Uint32(b), nil
|
|
}
|
|
|
|
func WriteByte(data byte, w io.Writer) (int, error) {
|
|
b := make([]byte, 1)
|
|
b[0] = byte(data)
|
|
return w.Write(b)
|
|
}
|
|
|
|
func WriteBytes(data []byte, w io.Writer) (int, error) {
|
|
return w.Write(data)
|
|
}
|
|
|
|
func WriteUInt8(data uint8, w io.Writer) (int, error) {
|
|
b := make([]byte, 1)
|
|
b[0] = byte(data)
|
|
return w.Write(b)
|
|
}
|
|
|
|
func WriteUInt16BE(data uint16, w io.Writer) (int, error) {
|
|
b := make([]byte, 2)
|
|
binary.BigEndian.PutUint16(b, data)
|
|
return w.Write(b)
|
|
}
|
|
|
|
func WriteUInt16LE(data uint16, w io.Writer) (int, error) {
|
|
b := make([]byte, 2)
|
|
binary.LittleEndian.PutUint16(b, data)
|
|
return w.Write(b)
|
|
}
|
|
|
|
func WriteUInt32LE(data uint32, w io.Writer) (int, error) {
|
|
b := make([]byte, 4)
|
|
binary.LittleEndian.PutUint32(b, data)
|
|
return w.Write(b)
|
|
}
|
|
|
|
func WriteUInt32BE(data uint32, w io.Writer) (int, error) {
|
|
b := make([]byte, 4)
|
|
binary.BigEndian.PutUint32(b, data)
|
|
return w.Write(b)
|
|
}
|
|
|
|
func PutUint16BE(data uint16) (uint8, uint8) {
|
|
b := make([]byte, 2)
|
|
binary.BigEndian.PutUint16(b, data)
|
|
return uint8(b[0]), uint8(b[1])
|
|
}
|
|
|
|
func Uint16BE(d0, d1 uint8) uint16 {
|
|
b := make([]byte, 2)
|
|
b[0] = d0
|
|
b[1] = d1
|
|
|
|
return binary.BigEndian.Uint16(b)
|
|
}
|
|
|
|
func RGB565ToRGB(data uint16) (r, g, b uint8) {
|
|
r = uint8((data & 0xF800) >> 8)
|
|
r |= r >> 5
|
|
g = uint8((data & 0x07E0) >> 3)
|
|
g |= g >> 6
|
|
b = uint8((data & 0x001F) << 3)
|
|
b |= b >> 5
|
|
|
|
return
|
|
}
|
|
|
|
func RGB555ToRGB(data uint16) (r, g, b uint8) {
|
|
r = uint8((data & 0x7C00) >> 7)
|
|
r |= r >> 5
|
|
g = uint8((data & 0x03E0) >> 2)
|
|
g |= g >> 5
|
|
b = uint8((data & 0x001F) << 3)
|
|
b |= b >> 5
|
|
|
|
return
|
|
}
|