chore: merge upstream master (0.43.7) into dev, bump to 0.43.7-dc.3

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.22
+        go-version: 1.25
 
     - name: Build linux amd64
       run: env CGO_ENABLED=0 go build -o geesefs-linux-amd64 -v && ln -s geesefs-linux-amd64 geesefs

.github/workflows/test.yml

@@ -4,18 +4,21 @@ on:
   push:
     branches:
     - master
+  pull_request:
+    branches: 
+    - master
 
 jobs:
 
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v2
 
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.22
+        go-version: 1.25
 
     - name: Build linux amd64
       run: env CGO_ENABLED=0 go build -o geesefs-linux-amd64 -v && ln -s geesefs-linux-amd64 geesefs

.gitignore

@@ -1,5 +1,8 @@
 *~
+geesefs
 goofys
 goofys.test
 xout
 s3proxy.jar
+test/s3proxy_test.properties
+core/*.log

Dockerfile.build

@@ -0,0 +1,26 @@
+# Dockerfile for building geesefs
+FROM golang:1.25.9-alpine AS builder
+
+# Install required packages
+RUN apk add --no-cache git make bash
+
+# Set working directory
+WORKDIR /build
+
+# Copy source code (needed for replace directives in go.mod)
+COPY . .
+
+# Download dependencies
+RUN go mod download
+
+# Set environment variables for static build
+ENV CGO_ENABLED=0
+ENV GOOS=linux
+
+# Build binary
+RUN go build -ldflags "-X main.Version=docker-build -s -w" -o geesefs .
+
+# Final stage - minimal image with binary only (optional)
+FROM scratch AS final
+COPY --from=builder /build/geesefs /geesefs
+ENTRYPOINT ["/geesefs"]

Makefile

@@ -23,6 +23,21 @@ install:
 	go install -ldflags "-X main.Version=`git rev-parse HEAD`"
 
 
-.PHONY: protoc
+# Docker build targets
+docker-build:
+	docker build -f Dockerfile.build -t geesefs-builder:latest .
+
+docker-binary: docker-build
+	@echo "Extracting binary from Docker container..."
+	@# Create temporary container and copy binary
+	@CONTAINER_ID=$$(docker create geesefs-builder:latest) && \
+	docker cp $$CONTAINER_ID:/geesefs ./geesefs && \
+	docker rm $$CONTAINER_ID && \
+	echo "Binary geesefs copied to project root"
+
+docker-clean:
+	docker rmi geesefs-builder:latest 2>/dev/null || true
+
+.PHONY: protoc docker-build docker-binary docker-clean
 protoc:
 	protoc --go_out=. --experimental_allow_proto3_optional --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative core/pb/*.proto

core/backend_adlv1.go

@@ -28,7 +28,7 @@ import (
 	"syscall"
 	"time"
 
-	uuid "github.com/satori/go.uuid"
+	uuid "github.com/gofrs/uuid"
 	"github.com/sirupsen/logrus"
 
 	adl "github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem"

core/backend_azblob.go

@@ -432,7 +432,7 @@ func (b *AZBlob) HeadBlob(param *HeadBlobInput) (*HeadBlobOutput, error) {
 	}
 
 	blob := c.NewBlobURL(param.Key)
-	resp, err := blob.GetProperties(context.TODO(), azblob.BlobAccessConditions{})
+	resp, err := blob.GetProperties(context.TODO(), azblob.BlobAccessConditions{}, azblob.ClientProvidedKeyOptions{})
 	if err != nil {
 		return nil, mapAZBError(err)
 	}
@@ -481,7 +481,7 @@ func (b *AZBlob) ListBlobs(param *ListBlobsInput) (*ListBlobsOutput, error) {
 	prefixes := make([]BlobPrefixOutput, 0)
 	items := make([]BlobItemOutput, 0)
 
-	var blobItems []azblob.BlobItem
+	var blobItems []azblob.BlobItemInternal
 	var nextMarker *string
 
 	options := azblob.ListBlobsSegmentOptions{
@@ -703,8 +703,8 @@ func (b *AZBlob) CopyBlob(param *CopyBlobInput) (*CopyBlobOutput, error) {
 
 	src := c.NewBlobURL(param.Source)
 	dest := c.NewBlobURL(param.Destination)
-	resp, err := dest.StartCopyFromURL(context.TODO(), src.URL(), nilMetadata(param.Metadata),
-		azblob.ModifiedAccessConditions{}, azblob.BlobAccessConditions{})
+	resp, err := dest.StartCopyFromURL(context.TODO(), src.URL(), azblob.Metadata(nilMetadata(param.Metadata)),
+		azblob.ModifiedAccessConditions{}, azblob.BlobAccessConditions{}, azblob.AccessTierNone, azblob.BlobTagsMap{})
 	if err != nil {
 		return nil, mapAZBError(err)
 	}
@@ -713,7 +713,7 @@ func (b *AZBlob) CopyBlob(param *CopyBlobInput) (*CopyBlobOutput, error) {
 		time.Sleep(50 * time.Millisecond)
 
 		var copy *azblob.BlobGetPropertiesResponse
-		for copy, err = dest.GetProperties(context.TODO(), azblob.BlobAccessConditions{}); err == nil; copy, err = dest.GetProperties(context.TODO(), azblob.BlobAccessConditions{}) {
+		for copy, err = dest.GetProperties(context.TODO(), azblob.BlobAccessConditions{}, azblob.ClientProvidedKeyOptions{}); err == nil; copy, err = dest.GetProperties(context.TODO(), azblob.BlobAccessConditions{}, azblob.ClientProvidedKeyOptions{}) {
 			// if there's a new copy, we can only assume the last one was done
 			if copy.CopyStatus() != azblob.CopyStatusPending || copy.CopyID() != resp.CopyID() {
 				break
@@ -745,7 +745,7 @@ func (b *AZBlob) GetBlob(param *GetBlobInput) (*GetBlobOutput, error) {
 			ModifiedAccessConditions: azblob.ModifiedAccessConditions{
 				IfMatch: ifMatch,
 			},
-		}, false)
+		}, false, azblob.ClientProvidedKeyOptions{})
 	if err != nil {
 		return nil, mapAZBError(err)
 	}
@@ -798,7 +798,7 @@ func (b *AZBlob) PutBlob(param *PutBlobInput) (*PutBlobOutput, error) {
 		azblob.BlobHTTPHeaders{
 			ContentType: NilStr(param.ContentType),
 		},
-		nilMetadata(param.Metadata), azblob.BlobAccessConditions{})
+		azblob.Metadata(nilMetadata(param.Metadata)), azblob.BlobAccessConditions{}, azblob.AccessTierNone, azblob.BlobTagsMap{}, azblob.ClientProvidedKeyOptions{}, azblob.ImmutabilityPolicyOptions{})
 	if err != nil {
 		return nil, mapAZBError(err)
 	}
@@ -837,7 +837,7 @@ func (b *AZBlob) MultipartBlobAdd(param *MultipartBlobAddInput) (*MultipartBlobA
 	base64BlockId := base64.StdEncoding.EncodeToString([]byte(blockId))
 
 	_, err = blob.StageBlock(context.TODO(), base64BlockId, param.Body,
-		azblob.LeaseAccessConditions{}, nil)
+		azblob.LeaseAccessConditions{}, nil, azblob.ClientProvidedKeyOptions{})
 	if err != nil {
 		return nil, mapAZBError(err)
 	}
@@ -880,7 +880,7 @@ func (b *AZBlob) MultipartBlobCopy(param *MultipartBlobCopyInput) (*MultipartBlo
 
 	_, err = blob.StageBlockFromURL(context.TODO(), base64BlockId,
 		srcBlobURL, int64(param.Offset), int64(param.Size),
-		azblob.LeaseAccessConditions{}, azblob.ModifiedAccessConditions{})
+		azblob.LeaseAccessConditions{}, azblob.ModifiedAccessConditions{}, azblob.ClientProvidedKeyOptions{}, nil)
 	if err != nil {
 		return nil, mapAZBError(err)
 	}
@@ -909,8 +909,8 @@ func (b *AZBlob) MultipartBlobCommit(param *MultipartBlobCommitInput) (*Multipar
 	}
 
 	resp, err := blob.CommitBlockList(context.TODO(), parts,
-		azblob.BlobHTTPHeaders{}, nilMetadata(param.Metadata),
-		azblob.BlobAccessConditions{})
+		azblob.BlobHTTPHeaders{}, azblob.Metadata(nilMetadata(param.Metadata)),
+		azblob.BlobAccessConditions{}, azblob.AccessTierNone, azblob.BlobTagsMap{}, azblob.ClientProvidedKeyOptions{}, azblob.ImmutabilityPolicyOptions{})
 	if err != nil {
 		return nil, mapAZBError(err)
 	}

core/backend_s3.go

@@ -38,6 +38,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/corehandlers"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/private/protocol/rest"
 	"github.com/aws/aws-sdk-go/service/s3"
 )
 
@@ -64,6 +65,10 @@ func NewS3(bucket string, flags *cfg.FlagStorage, config *cfg.S3Config) (*S3Back
 	if config.MultipartCopyThreshold == 0 {
 		config.MultipartCopyThreshold = 128 * 1024 * 1024
 	}
+	config.CopySourceBucket = bucket
+	if config.Subdomain {
+		bucket = "/"
+	}
 
 	if config.ProjectId != "" {
 		log.Infof("Using Ceph multitenancy format bucket naming: %s", bucket)
@@ -268,6 +273,11 @@ func (s *S3Backend) newS3() {
 		Fn: request.MakeAddToUserAgentHandler("GeeseFS", cfg.GEESEFS_VERSION,
 			runtime.Version(), runtime.GOOS, runtime.GOARCH),
 	})
+	s.S3.Handlers.Build.PushBack(func(req *request.Request) {
+		if s.config.Subdomain {
+			req.HTTPRequest.URL.RawPath = rest.EscapePath(req.HTTPRequest.URL.Path, false)
+		}
+	})
 }
 
 func (s *S3Backend) detectBucketLocationByHEAD() (err error, isAws bool) {
@@ -816,7 +826,7 @@ func (s *S3Backend) CopyBlob(param *CopyBlobInput) (*CopyBlobOutput, error) {
 		metadataDirective = s3.MetadataDirectiveReplace
 	}
 
-	from := s.bucket + "/" + param.Source
+	from := s.config.CopySourceBucket + "/" + param.Source
 
 	// Copy into the same object is used to just update metadata
 	// and should be very quick regardless of parameters
@@ -1130,7 +1140,7 @@ func (s *S3Backend) MultipartBlobCopy(param *MultipartBlobCopyInput) (*Multipart
 		Bucket:     &s.bucket,
 		Key:        param.Commit.Key,
 		PartNumber: aws.Int64(int64(param.PartNumber)),
-		CopySource: aws.String(pathEscape(s.bucket + "/" + param.CopySource)),
+		CopySource: aws.String(pathEscape(s.config.CopySourceBucket + "/" + param.CopySource)),
 		UploadId:   param.Commit.UploadId,
 	}
 	if param.Size != 0 {

core/cfg/conf_azure.go

@@ -269,7 +269,7 @@ func azureFindAccount(client azblob.AccountsClient, account string) (*azblob.End
 		return nil, "", err
 	}
 
-	for _, acc := range *accountsRes.Value {
+	for _, acc := range accountsRes.Values() {
 		if *acc.Name == account {
 			// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/...
 			parts := strings.SplitN(*acc.ID, "/", 6)
@@ -370,7 +370,7 @@ func AzureBlobConfig(endpoint string, location string, storageType string) (conf
 
 			if key == "" {
 				var keysRes azblob.AccountListKeysResult
-				keysRes, err = client.ListKeys(context.TODO(), resourceGroup, account)
+				keysRes, err = client.ListKeys(context.TODO(), resourceGroup, account, "")
 				if err != nil || len(*keysRes.Keys) == 0 {
 					err = fmt.Errorf("Missing key: configure via AZURE_STORAGE_KEY "+
 						"or %v/config", configDir)

core/cfg/conf_s3.go

@@ -21,6 +21,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"net/http"
+	"net/url"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -70,7 +71,8 @@ type S3Config struct {
 	ListV2     bool
 	ListV1Ext  bool
 
-	Subdomain bool
+	CopySourceBucket string
+	Subdomain        bool
 
 	UseIAM    bool
 	IAMFlavor string
@@ -132,10 +134,18 @@ func (c *S3Config) ToAwsConfig(flags *FlagStorage) (*aws.Config, error) {
 			c.Credentials = credentials.NewStaticCredentials(c.AccessKey, c.SecretKey, "")
 		}
 	}
+
 	if flags.Endpoint != "" {
+		if c.Subdomain {
+			u, err := url.Parse(flags.Endpoint)
+			if err != nil {
+				return nil, err
+			}
+			u.Host = c.CopySourceBucket + "." + u.Host
+			flags.Endpoint = u.String()
+		}
 		awsConfig.Endpoint = &flags.Endpoint
 	}
-
 	awsConfig.S3ForcePathStyle = aws.Bool(!c.Subdomain)
 
 	awsConfig.Retryer = client.DefaultRetryer{

core/cfg/config.go

@@ -50,6 +50,8 @@ type FlagStorage struct {
 	Setuid   int
 	Setgid   int
 
+	IgnoreSettingAttrsForRootDirErrors bool
+
 	// Common Backend Config
 	UseContentType bool
 	Endpoint       string
@@ -88,6 +90,7 @@ type FlagStorage struct {
 	EnablePerms         bool
 	EnableSpecials      bool
 	EnableMtime         bool
+	EmulateHardlinks    bool
 	DisableXattr        bool
 	UidAttr             string
 	GidAttr             string