Added audit logs for all file operations

Author: dm3ch

bucketio.go

@@ -438,7 +438,7 @@ type S3ObjectStat struct {
 }
 
 func (sos *S3ObjectStat) ListAt(result []os.FileInfo, o int64) (int, error) {
-	F(sos.Debug, "S3ObjectStat.: len(result)=%d offset=%d", len(result), o)
+	F(sos.Debug, "S3ObjectStat.ListAt: len(result)=%d offset=%d", len(result), o)
 	_o, err := castInt64ToInt(o)
 	if err != nil {
 		return 0, err
@@ -578,6 +578,7 @@ func (s3io *S3BucketIO) Fileread(req *sftp.Request) (io.ReaderAt, error) {
 
 	keyStr := key.String()
 	ctx := combineContext(s3io.Ctx, req.Context())
+	F(s3io.Log.Info, "Audit: User %s downloaded file \"%s\"", s3io.UserInfo.String(), keyStr)
 	F(s3io.Log.Debug, "GetObject(Bucket=%s, Key=%s)", s3io.Bucket.Bucket, keyStr)
 	sse := s3io.ServerSideEncryption
 	goo, err := s3.GetObjectWithContext(
@@ -620,7 +621,7 @@ func (s3io *S3BucketIO) Filewrite(req *sftp.Request) (io.WriterAt, error) {
 		Size:         0,
 		LastModified: s3io.Now(),
 	}
-	F(s3io.Log.Info, "Upload file %s by user %s", key, s3io.UserInfo.User)
+	F(s3io.Log.Info, "Audit: User %s uploaded file \"%s\"", s3io.UserInfo.String(), key)
 	F(s3io.Log.Debug, "S3PutObjectWriter.New(key=%s)", key)
 	oow := &S3PutObjectWriter{
 		Ctx:                  combineContext(s3io.Ctx, req.Context()),
@@ -658,6 +659,7 @@ func (s3io *S3BucketIO) Filecmd(req *sftp.Request) error {
 		destStr := dest.String()
 		copySource := s3io.Bucket.Bucket + "/" + srcStr
 		sse := s3io.ServerSideEncryption
+		F(s3io.Log.Info, "Audit: User %s renamed \"%s\" to \"%s\"", s3io.UserInfo.String(), srcStr, destStr)
 		F(s3io.Log.Debug, "CopyObject(Bucket=%s, Key=%s, CopySource=%s, Sse=%v)", s3io.Bucket.Bucket, destStr, copySource, sse.Type)
 		_, err = s3io.Bucket.S3(sess).CopyObjectWithContext(
 			combineContext(s3io.Ctx, req.Context()),
@@ -702,6 +704,7 @@ func (s3io *S3BucketIO) Filecmd(req *sftp.Request) error {
 			return err
 		}
 		keyStr := key.String()
+		F(s3io.Log.Info, "Audit: User %s deleted file \"%s\"", s3io.UserInfo.String(), key)
 		F(s3io.Log.Debug, "DeleteObject(Bucket=%s, Key=%s)", s3io.Bucket.Bucket, key)
 		_, err = s3io.Bucket.S3(sess).DeleteObjectWithContext(
 			combineContext(s3io.Ctx, req.Context()),
@@ -728,6 +731,7 @@ func (s3io *S3BucketIO) Filelist(req *sftp.Request) (sftp.ListerAt, error) {
 		if !s3io.Perms.Readable && !s3io.Perms.Listable {
 			return nil, fmt.Errorf("stat operation not allowed as per configuration")
 		}
+		F(s3io.Log.Info, "Audit: User %s read path stats \"%s\"", s3io.UserInfo.String(), req.Filepath)
 		key := buildKey(s3io.Bucket, req.Filepath)
 		return &S3ObjectStat{
 			DebugLogger:      s3io.Log,
@@ -742,6 +746,7 @@ func (s3io *S3BucketIO) Filelist(req *sftp.Request) (sftp.ListerAt, error) {
 		if !s3io.Perms.Listable {
 			return nil, fmt.Errorf("listing operation not allowed as per configuration")
 		}
+		F(s3io.Log.Info, "Audit: User %s listed path \"%s\"", s3io.UserInfo.String(), req.Filepath)
 		return &S3ObjectLister{
 			DebugLogger:      s3io.Log,
 			Ctx:              combineContext(s3io.Ctx, req.Context()),

user_info.go

@@ -1,8 +1,15 @@
 package main
 
-import "net"
+import (
+	"fmt"
+	"net"
+)
 
 type UserInfo struct {
-	Addr  net.Addr
+	Addr net.Addr
 	User string
 }
+
+func (uInfo UserInfo) String() string {
+	return fmt.Sprintf("%s from %s", uInfo.User, uInfo.Addr.String())
+}