Merge pull request #18 from trendmicro/update_to_latest_version_v1.6.0

update to latest version: v1.6.0

Author: neilhsu-tm

CHANGELOG.md

@@ -1,11 +1,16 @@
 # CHANGELOG
 
+## 1.6.0 - 2025-06-30
+
+* Add active content detection support via `SetActiveContentEnable` function
+
 ## 1.5.1 - 2025-03-03
 
 * Support new region me-central-1
 * Fix CVE-2023-45288
 
 ## 1.5.0 - 2024-12-16
+
 * Add `ScanReader` for scanning a well-implemented `AmaasClientReader`
 * Add example code `scan-s3obj` for scanning an S3 object which is an example of using `ScanReader`
 

README.md

@@ -192,6 +192,20 @@ You can enable verbose scan result by calling the `SetVerboseEnable` function:
 client.SetVerboseEnable()
 ```
 
+### Enable Active Content Detection
+
+Enables active content detection for scanning operations. This feature allows the scanner to detect potentially malicious active content within files, specifically:
+
+- **PDF scripts**: Detects embedded JavaScript and other scripting content in PDF files
+- **Office macros**: Detects VBA macros and other executable content in Microsoft Office documents
+
+When active content is detected, the scan result will include a type field with values of either `macro` or `script` to indicate the type of active content found.
+
+```go
+client.SetActiveContentEnable()
+```
+
+
 ### Disable Digest Calculation
 
 You can disable digest calculation by calling the `SetDigestDisable` function:
@@ -420,6 +434,9 @@ Specify to enable SPN feedback
 `-verbose`
 Specify to enable verbose scan result
 
+`-active-content`
+Specify to enable active content detection
+
 `-tag <string>`
 Specify the tags to be used for scanning, separated by commas
 
@@ -464,6 +481,9 @@ Specify to enable SPN feedback
 `-verbose`
 Specify to enable verbose scan result
 
+`-active-content`
+Specify to enable active content detection
+
 `-tag <string>`
 Specify the tags to be used for scanning, separated by commas
 

VERSION

@@ -1 +1 @@
-1.5.1
+1.6.0

examples/client/client.go

@@ -3,29 +3,34 @@ package main
 import (
 	"flag"
 	"log"
-	"os"
 	"strings"
 
 	amaasclient "github.com/trendmicro/tm-v1-fs-golang-sdk"
 )
 
 var (
-	addr     = flag.String("addr", "", "the address to connect to")
-	apiKey   = flag.String("apikey", "", "API key for service authentication")
-	fileName = flag.String("filename", os.Args[0], "file to scan")
-	tls      = flag.Bool("tls", false, "enable/disable TLS")
-	region   = flag.String("region", "", "the region to connect to")
-	pml      = flag.Bool("pml", false, "enable/disable predictive machine learning detection")
-	feedback = flag.Bool("feedback", false, "enable/disable SPN feedback")
-	verbose  = flag.Bool("verbose", false, "enable/disable verbose scan result")
-	tag      = flag.String("tag", "", "tags to be used for scanning")
-	digest   = flag.Bool("digest", true, "enable/disable digest calculation")
-	caCert   = flag.String("ca_cert", "", "CA certificate for self hosted AMaaS server")
+	addr          = flag.String("addr", "", "the address to connect to")
+	apiKey        = flag.String("apikey", "", "API key for service authentication")
+	filenameFlag  = flag.String("filename", "", "file to scan (optional, can also be specified as the last argument)")
+	tls           = flag.Bool("tls", false, "enable/disable TLS")
+	region        = flag.String("region", "", "the region to connect to")
+	pml           = flag.Bool("pml", false, "enable/disable predictive machine learning detection")
+	feedback      = flag.Bool("feedback", false, "enable/disable SPN feedback")
+	verbose       = flag.Bool("verbose", false, "enable/disable verbose scan result")
+	activeContent = flag.Bool("active-content", false, "enable/disable active content detection")
+	tag           = flag.String("tag", "", "tags to be used for scanning")
+	digest        = flag.Bool("digest", true, "enable/disable digest calculation")
+	caCert        = flag.String("ca_cert", "", "CA certificate for self hosted AMaaS server")
 )
 
 func main() {
 	flag.Parse()
 
+	fileName := getFileName()
+	if fileName == "" {
+		log.Fatal("Please specify a file to scan using either -filename flag or as the last argument")
+	}
+
 	var client *amaasclient.AmaasClient
 	var err error
 
@@ -57,6 +62,10 @@ func main() {
 		client.SetVerboseEnable()
 	}
 
+	if *activeContent {
+		client.SetActiveContentEnable()
+	}
+
 	if !*digest {
 		client.SetDigestDisable()
 	}
@@ -66,7 +75,7 @@ func main() {
 		tagsArray = strings.Split(*tag, ",")
 	}
 
-	result, err := client.ScanFile(*fileName, tagsArray)
+	result, err := client.ScanFile(fileName, tagsArray)
 	if err != nil {
 		log.Fatal(err.Error())
 	}
@@ -75,3 +84,19 @@ func main() {
 
 	client.Destroy()
 }
+
+func getFileName() string {
+	var fileName string
+
+	args := flag.Args()
+
+	if len(args) > 0 {
+		fileName = args[len(args)-1]
+	}
+
+	if *filenameFlag != "" {
+		fileName = *filenameFlag
+	}
+
+	return fileName
+}

examples/scan-s3obj/go.mod

@@ -1,6 +1,10 @@
 module github.com/trendmicro/tm-v1-fs-golang-sdk/examples/scan-s3obj
 
-go 1.23
+go 1.23.0
+
+toolchain go1.24.2
+
+replace github.com/trendmicro/tm-v1-fs-golang-sdk => ../../
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.32.5 // indirect
@@ -19,18 +23,17 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.33.1 // indirect
 	github.com/aws/smithy-go v1.22.1 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
-	google.golang.org/grpc v1.62.1 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
+	google.golang.org/grpc v1.73.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 )
 
 require (
-	github.com/trendmicro/tm-v1-fs-golang-sdk v0.0.0-20241119105152-8e5832d37e21
+	github.com/trendmicro/tm-v1-fs-golang-sdk v0.0.0
 	github.com/aws/aws-sdk-go-v2/config v1.28.5
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.67.1
 )

examples/scan-s3obj/go.sum

@@ -1,5 +1,3 @@
-github.com/trendmicro/tm-v1-fs-golang-sdk v0.0.0-20241119105152-8e5832d37e21 h1:30XGBlE8B4nrYGFPNxz8Q+tIPQPb95zKIHqmVM5jh8w=
-github.com/trendmicro/tm-v1-fs-golang-sdk v0.0.0-20241119105152-8e5832d37e21/go.mod h1:P/bveu/shq7hy5xRt2h6L1H6yR2FGqaNIJ7lm+yJLKU=
 github.com/aws/aws-sdk-go-v2 v1.32.5 h1:U8vdWJuY7ruAkzaOdD7guwJjD06YSKmnKCJs7s3IkIo=
 github.com/aws/aws-sdk-go-v2 v1.32.5/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 h1:lL7IfaFzngfx0ZwUGOZdsFFnQ5uLvR0hWqqhyE7Q9M8=
@@ -38,29 +36,47 @@ github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
 github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
+github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
+go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
+go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
+go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
+go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
+go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
+go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
+go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
+go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
+go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
-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/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 h1:8EeVk1VKMD+GD/neyEHGmz7pFblqPjHoi+PGQIlLx2s=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
-google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
-google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
+google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

examples/scan-s3obj/scan-s3obj.go

@@ -35,6 +35,7 @@ func main() {
 	var pml bool
 	var feedback bool
 	var verbose bool
+	var activeContent bool
 	var tag string
 	var digest bool
 
@@ -49,6 +50,7 @@ func main() {
 	flag.BoolVar(&pml, "pml", false, "enable predictive machine learning detection")
 	flag.BoolVar(&feedback, "feedback", false, "enable SPN feedback")
 	flag.BoolVar(&verbose, "verbose", false, "enable verbose scan result")
+	flag.BoolVar(&activeContent, "active-content", false, "enable/disable active content detection")
 	flag.StringVar(&tag, "tag", "", "tags to be used for scanning. separated by comma.")
 	flag.StringVar(&caCert, "ca_cert", "", "CA certificate for self hosted AMaaS server")
 	flag.BoolVar(&digest, "digest", false, "enable digest calculation. it might increase network traffic for cloud file.")
@@ -86,6 +88,10 @@ func main() {
 		ac.SetVerboseEnable()
 	}
 
+	if activeContent {
+		ac.SetActiveContentEnable()
+	}
+
 	if !digest {
 		// disable digest calculation to reduce network traffic if file is on cloud
 		ac.SetDigestDisable()

examples/scanfiles/scanfiles.go

@@ -54,6 +54,7 @@ func main() {
 	var pml bool
 	var feedback bool
 	var verbose bool
+	var activeContent bool
 	var tag string
 	var digest bool
 
@@ -68,6 +69,7 @@ func main() {
 	flag.BoolVar(&pml, "pml", false, "enable/disable predictive machine learning detection")
 	flag.BoolVar(&feedback, "feedback", false, "enable/disable SPN feedback")
 	flag.BoolVar(&verbose, "verbose", false, "enable/disable verbose scan result")
+	flag.BoolVar(&activeContent, "active-content", false, "enable/disable active content detection")
 	flag.StringVar(&tag, "tag", "", "tags to be used for scanning")
 	flag.StringVar(&caCert, "ca_cert", "", "CA certificate for self hosted AMaaS server")
 	flag.BoolVar(&digest, "digest", true, "enable/disable verbose scan result")
@@ -114,6 +116,10 @@ func main() {
 		ac.SetVerboseEnable()
 	}
 
+	if activeContent {
+		ac.SetActiveContentEnable()
+	}
+
 	if !digest {
 		ac.SetDigestDisable()
 	}

go.mod

@@ -1,22 +1,22 @@
 module github.com/trendmicro/tm-v1-fs-golang-sdk
 
-go 1.19
+go 1.23.0
 
 require (
-	github.com/golang-jwt/jwt v3.2.2+incompatible
+	github.com/golang-jwt/jwt/v5 v5.2.2
 	github.com/stretchr/testify v1.8.1
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
-	golang.org/x/net v0.33.0
-	google.golang.org/grpc v1.62.1
-	google.golang.org/protobuf v1.33.0
+	golang.org/x/net v0.38.0
+	google.golang.org/grpc v1.73.0
+	google.golang.org/protobuf v1.36.6
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+
 )