Merge pull request #39 from newrelic/dev

Release v1.1.0

Changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [v1.1.0] - 2024-03-26
+### Features
+* Functionality to report API endpoints of the application
+### Bug fixes
+* Updated permissions for file/directory created by security agent
+### Miscellaneous chores
+* Bumped google.golang.org/protobuf from v1.32.0 to v1.33.0
+* Improved logging.
+
 ## [v1.0.0] - 2024-02-07
 ### Changes
 * Added env variable to print logs on stdout.

instrumentation/csec_grpc/go.mod

@@ -3,9 +3,9 @@ module github.com/newrelic/csec-go-agent/instrumentation/csec_grpc
 go 1.17
 
 require (
-github.com/newrelic/csec-go-agent v1.0.0
+	github.com/newrelic/csec-go-agent v1.1.0
 	google.golang.org/grpc v1.58.3
-	google.golang.org/protobuf v1.32.0
+	google.golang.org/protobuf v1.33.0
 	github.com/golang/protobuf v1.5.3
 )
 

internal/security_logs/initLogging.go

@@ -28,7 +28,7 @@ func InitLogger() *logFile {
 }
 
 func EndStage(stageId, logs interface{}) {
-	print := fmt.Sprintf("[STEP-%s] %s", stageId, logs)
+	print := fmt.Sprintf("[STEP-%s] => %s", stageId, logs)
 	PrintInitlog(print)
 }
 func PrintInitlog(logs interface{}) {

internal/security_logs/rotateFileHook.go

@@ -38,21 +38,22 @@ func (config *RotateFileConfig) createLogDir() (io.Writer, error) {
 		return nil, err
 	}
 
-	err = os.Chmod(config.Filepath, 0777)
+	err = os.Chmod(config.Filepath, 0770)
 	if err != nil {
 		return nil, err
 	}
 
-	err = os.Chmod(filepath.Dir(config.Filepath), 0777)
+	err = os.Chmod(filepath.Dir(config.Filepath), 0770)
 	if err != nil {
 		return nil, err
 	}
 
-	logfile, err := os.OpenFile(config.Filename, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0777)
+	logfile, err := os.OpenFile(config.Filename, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0660)
 
 	if err != nil {
 		return nil, err
 	}
+	logfile.Chmod(0660)
 	return logfile, nil
 
 }
@@ -112,7 +113,7 @@ func (hook *RotateFileHook) logrollover() error {
 	pid := secUtils.IntToString(os.Getpid())
 
 	if !secUtils.IsFileExist(lockFile) {
-		err := os.WriteFile(lockFile, []byte(pid), 777)
+		err := os.WriteFile(lockFile, []byte(pid), 0660)
 		if err != nil {
 			return err
 		}
@@ -143,7 +144,8 @@ func (hook *RotateFileHook) filerollover() error {
 	}
 
 	timeStamp := time.Now().Unix()
-	rolloverLogFile, err := os.OpenFile(hook.Config.Filename+"."+strconv.FormatInt(timeStamp, 10), os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0777)
+	rolloverLogFile, err := os.OpenFile(hook.Config.Filename+"."+strconv.FormatInt(timeStamp, 10), os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0660)
+	rolloverLogFile.Chmod(0660)
 	if err != nil {
 		return err
 	}

internal/security_utils/config.go

@@ -4,8 +4,8 @@
 package security_utils
 
 const (
-	CollectorVersion = "1.0.0"
+	CollectorVersion = "1.1.0"
 	JsonVersion      = "1.1.1"
 	CollectorType    = "GOLANG"
-	BuildNumber      = "157"
+	BuildNumber      = "158"
 )

security_config/global_config.go

@@ -20,6 +20,8 @@ var SecureWS secUtils.SecureWSiface
 
 type Info_struct struct {
 	EventData           eventData
+	ApiData             []Urlmappings
+	ApiDataMutex        sync.Mutex
 	EnvironmentInfo     EnvironmentInfo
 	ApplicationInfo     runningApplicationInfo
 	InstrumentationData Instrumentation
@@ -131,6 +133,19 @@ func (info *Info_struct) SetBodyLimit(bodyLimit int) {
 	return
 }
 
+func (info *Info_struct) GetApiData() []Urlmappings {
+	info.ApiDataMutex.Lock()
+	defer info.ApiDataMutex.Unlock()
+	return info.ApiData
+}
+
+func (info *Info_struct) SetApiData(data Urlmappings) {
+	info.ApiDataMutex.Lock()
+	defer info.ApiDataMutex.Unlock()
+	info.ApiData = append(info.ApiData, data)
+	return
+}
+
 type metaData struct {
 	linkingMetadata interface{}
 	accountID       string
@@ -360,6 +375,12 @@ func (e *EventStats) IncreaseEventErrorCount() {
 	}
 }
 
+type Urlmappings struct {
+	Method  string `json:"method"`
+	Path    string `json:"path"`
+	Handler string `json:"handler"`
+}
+
 type EnvironmentInfo struct {
 	ID                string
 	NodeId            string

security_event_generation/event_generation.go

@@ -43,6 +43,7 @@ func InitHcScheduler() {
 	logging.EndStage("5", "Security agent components started")
 	SendSecHealthCheck()
 	sendBufferLogMessage()
+	sendUrlMappingEvent()
 	t := time.NewTicker(5 * time.Minute)
 	for {
 		select {
@@ -251,6 +252,21 @@ func SendFuzzFailEvent(fuzzHeader string) {
 	}
 }
 
+func sendUrlMappingEvent() {
+	var urlMappingBeen UrlMappingBeen
+	urlMappingBeen.EventType = "sec-application-url-mapping"
+	urlMappingBeen.ApplicationIdentifiers = getApplicationIdentifiers("sec-application-url-mapping")
+	mappings := secConfig.GlobalInfo.GetApiData()
+	if len(mappings) <= 0 {
+		return
+	}
+	urlMappingBeen.Mappings = secConfig.GlobalInfo.GetApiData()
+	_, err := sendEvent(urlMappingBeen, "", "")
+	if err != nil {
+		logger.Errorln(err)
+	}
+}
+
 func SendVulnerableEvent(req *secUtils.Info_req, category string, args interface{}, vulnerabilityDetails secUtils.VulnerabilityDetails, eventId string) *secUtils.EventTracker {
 	var tmp_event eventJson
 

security_event_generation/event_generation_utils.go

@@ -176,8 +176,8 @@ type IASTDataRequestBeen struct {
 
 type UrlMappingBeen struct {
 	ApplicationIdentifiers
-	EventType string        `json:"eventType"`
-	Mappings  []Urlmappings `json:"mappings"`
+	EventType string      `json:"eventType"`
+	Mappings  interface{} `json:"mappings"`
 }
 
 type Urlmappings struct {
@@ -250,14 +250,15 @@ func populateStatusLogs(service, process map[string]interface{}) {
 		logger.Errorln(err)
 		return
 	}
-	err = os.Chmod(statusFilePath, 0777)
+	err = os.Chmod(statusFilePath, 0770)
 	if err != nil {
 		SendLogMessage(err.Error(), "populateStatusLogs", "SEVERE")
 		logger.Errorln(err)
 		return
 	}
 	statusFilePath1 := filepath.Join(statusFilePath, fmt.Sprintf("go-security-collector-status-%s.log", secConfig.GlobalInfo.ApplicationInfo.GetAppUUID()))
-	f, err := os.OpenFile(statusFilePath1, os.O_RDWR|os.O_CREATE, 0777)
+	f, err := os.OpenFile(statusFilePath1, os.O_RDWR|os.O_CREATE, 0660)
+	f.Chmod(0660)
 	if err != nil {
 		SendLogMessage(err.Error(), "populateStatusLogs", "SEVERE")
 		logger.Errorln(err)
@@ -306,7 +307,7 @@ func wsStatus() string {
 }
 
 func isLogAccessible(fileName string) string {
-	file, err := os.OpenFile(fileName, os.O_WRONLY, 0777)
+	file, err := os.OpenFile(fileName, os.O_WRONLY, 0660)
 	if err == nil {
 		defer file.Close()
 		return "OK"

security_intercept/intercept.go

@@ -575,7 +575,7 @@ func createFuzzFile(fuzzheaders string) (tmpFiles []string) {
 				tmpFiles = append(tmpFiles, fileName)
 				dir := filepath.Dir(fileName)
 				if dir != "" {
-					err := os.MkdirAll(dir, os.ModePerm)
+					err := os.MkdirAll(dir, 0770)
 					if err != nil {
 						logger.Debugln("Error while creating file : ", err.Error())
 					}
@@ -726,6 +726,8 @@ func SendEvent(caseType string, data ...interface{}) interface{} {
 		httpresponseHandler(data...)
 	case "OUTBOUND":
 		return outboundcallHandler(data[0])
+	case "API_END_POINTS":
+		apiEndPointsHandler(data...)
 	case "GRPC":
 		grpcRequestHandler(data...)
 	case "GRPC_INFO":
@@ -853,7 +855,22 @@ func grpcRequestHandler(data ...interface{}) {
 	} else {
 		secConfig.Secure.AssociateGrpcQueryParam(data[0], "", "v2")
 	}
+}
 
+func apiEndPointsHandler(data ...interface{}) {
+	if data == nil || !isAgentInitialized() {
+		return
+	}
+	if len(data) >= 3 {
+		path, _ := data[0].(string)
+		method, _ := data[1].(string)
+		handler, _ := data[2].(string)
+		secConfig.GlobalInfo.SetApiData(secConfig.Urlmappings{
+			Path:    path,
+			Method:  method,
+			Handler: handler,
+		})
+	}
 }
 
 func grpcInfoHandler(data ...interface{}) {