diff --git a/changelog/8.0.0_2026-02-13/bump-go-1.25.md b/changelog/8.0.0_2026-02-13/bump-go-1.25.md index 7d8f9f425b5..2f2a5418069 100644 --- a/changelog/8.0.0_2026-02-13/bump-go-1.25.md +++ b/changelog/8.0.0_2026-02-13/bump-go-1.25.md @@ -2,8 +2,5 @@ Enhancement: Update to go 1.25 We have updated go to version 1.25 and alpine to version 3.23.3 -<<<<<<< HEAD https://github.com/owncloud/ocis/pull/12011 -======= https://github.com/owncloud/ocis/pull/12004 ->>>>>>> de492f72ded (feat: bump go to 1.25) diff --git a/go.mod b/go.mod index a3bf9b4396e..cd59ebcbaf0 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/open-policy-agent/opa v1.12.3 github.com/orcaman/concurrent-map v1.0.0 github.com/owncloud/libre-graph-api-go v1.0.5-0.20260116104114-10074a92be64 - github.com/owncloud/reva/v2 v2.0.0-20260205150948-e8cf2a492c9d + github.com/owncloud/reva/v2 v2.0.0-20260213104810-a8d45f58b2d5 github.com/pkg/errors v0.9.1 github.com/pkg/xattr v0.4.12 github.com/prometheus/client_golang v1.23.2 diff --git a/go.sum b/go.sum index b121ac8e9a9..7e16c8bbd5b 100644 --- a/go.sum +++ b/go.sum @@ -742,8 +742,8 @@ github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HD github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/owncloud/libre-graph-api-go v1.0.5-0.20260116104114-10074a92be64 h1:z9djjzd+leAy6QZpi8dLy3OVjc/um+1XAGk1SJEvwE8= github.com/owncloud/libre-graph-api-go v1.0.5-0.20260116104114-10074a92be64/go.mod h1:z61VMGAJRtR1nbgXWiNoCkxUXP1B3Je9rMuJbnGd+Og= -github.com/owncloud/reva/v2 v2.0.0-20260205150948-e8cf2a492c9d h1:ktfqsrqrjhcYV6KPqkm+iQmnbpRcUmKOCt3A5lirckc= -github.com/owncloud/reva/v2 v2.0.0-20260205150948-e8cf2a492c9d/go.mod h1:eHbT6pmVlcjdiBeVEYw7exlfJmemMzKBh4R+HFgx9Cc= +github.com/owncloud/reva/v2 v2.0.0-20260213104810-a8d45f58b2d5 h1:JyDXgzdkdfAPt9uRMQu49AreYpaUl+RinrNVITyfHu4= +github.com/owncloud/reva/v2 v2.0.0-20260213104810-a8d45f58b2d5/go.mod h1:ahCZbT/ltp5J8aURUpTOfpA/dLBeTvHaMm772cvj7+U= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0= github.com/pablodz/inotifywaitgo v0.0.9 h1:njquRbBU7fuwIe5rEvtaniVBjwWzcpdUVptSgzFqZsw= diff --git a/ocis-pkg/version/version.go b/ocis-pkg/version/version.go index 25909cab8ed..ba18fc29eaa 100644 --- a/ocis-pkg/version/version.go +++ b/ocis-pkg/version/version.go @@ -16,7 +16,7 @@ var ( // LatestTag is the latest released version plus the dev meta version. // Will be overwritten by the release pipeline // Needs a manual change for every tagged release - LatestTag = "8.0.0" + LatestTag = "8.0.0+dev" // Date indicates the build date. // This has been removed, it looks like you can only replace static strings with recent go versions diff --git a/sonar-project.properties b/sonar-project.properties index 8c4c79b9faa..da7c2b29e77 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=owncloud_ocis sonar.organization=owncloud-1 sonar.projectName=ocis -sonar.projectVersion=8.0.0 +sonar.projectVersion=8.0.0+dev sonar.host.url=https://sonarcloud.io # ===================================================== diff --git a/vendor/github.com/owncloud/reva/v2/internal/http/services/owncloud/ocdav/propfind/propfind.go b/vendor/github.com/owncloud/reva/v2/internal/http/services/owncloud/ocdav/propfind/propfind.go index e43f035b919..9711a5b4274 100644 --- a/vendor/github.com/owncloud/reva/v2/internal/http/services/owncloud/ocdav/propfind/propfind.go +++ b/vendor/github.com/owncloud/reva/v2/internal/http/services/owncloud/ocdav/propfind/propfind.go @@ -37,6 +37,7 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" + "github.com/iancoleman/strcase" "github.com/owncloud/reva/v2/internal/grpc/services/storageprovider" "github.com/owncloud/reva/v2/internal/http/services/owncloud/ocdav/config" "github.com/owncloud/reva/v2/internal/http/services/owncloud/ocdav/errors" @@ -52,7 +53,6 @@ import ( "github.com/owncloud/reva/v2/pkg/rhttp/router" "github.com/owncloud/reva/v2/pkg/storagespace" "github.com/owncloud/reva/v2/pkg/utils" - "github.com/iancoleman/strcase" "github.com/rs/zerolog" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" @@ -1538,8 +1538,8 @@ func mdToPropResponse(ctx context.Context, pf *XML, md *provider.ResourceInfo, p } case "signature-auth": if isPublic { - // We only want to add the attribute to the root of the propfind. - if strings.HasSuffix(p, ls.Token) && ls.Signature != nil { + // Required to support archive downloads in password-protected public links. + if strings.Contains(p, ls.Token) && ls.Signature != nil { expiration := time.Unix(int64(ls.Signature.SignatureExpiration.Seconds), int64(ls.Signature.SignatureExpiration.Nanos)) var sb strings.Builder sb.WriteString("") diff --git a/vendor/modules.txt b/vendor/modules.txt index 33f4337247c..b3956c62c73 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1313,7 +1313,7 @@ github.com/orcaman/concurrent-map # github.com/owncloud/libre-graph-api-go v1.0.5-0.20260116104114-10074a92be64 ## explicit; go 1.18 github.com/owncloud/libre-graph-api-go -# github.com/owncloud/reva/v2 v2.0.0-20260205150948-e8cf2a492c9d +# github.com/owncloud/reva/v2 v2.0.0-20260213104810-a8d45f58b2d5 ## explicit; go 1.24.0 github.com/owncloud/reva/v2/cmd/revad/internal/grace github.com/owncloud/reva/v2/cmd/revad/runtime