Merge branch 'main' into cras

Author: github-actions

.circleci/config.yml

@@ -6,7 +6,7 @@ orbs:
 parameters:
   go-version:
     type: string
-    default: '1.23.5'
+    default: '1.24.0'
 
 executors:
   node:
@@ -41,7 +41,7 @@ executors:
       - image: ubuntu:24.04
   golangci-lint:
     docker:
-      - image: golangci/golangci-lint:v1.60.1
+      - image: golangci/golangci-lint:v1.64
   ubuntu-machine:
     machine:
       image: ubuntu-2404:2024.05.1

.golangci.yml

@@ -20,11 +20,11 @@ linters:
     - bodyclose
     - containedctx
     - contextcheck
+    - copyloopvar
     - decorder
     - dogsled
     - dupl
     - dupword
-    - exportloopref
     - forcetypeassert
     - gofumpt
     - goimports
@@ -55,7 +55,7 @@ linters-settings:
     locale: US
 
 issues:
-  max-per-linter: 0
+  max-issues-per-linter: 0
   max-same-issues: 0
   exclude:
     # EXC0004 excluded due to spurious "should have signature XYZ" errors on

CHANGELOG.md

@@ -49,6 +49,7 @@
 
 ## Requirements / Packaging
 
+- Go 1.23.4 or above is now required to build SingularityCE.
 - libsubid headers are now required to build SingularityCE, unless the
   `--without-libsubid` flag is passed to `mconfig`.
 - EL RPM packages are built with libsubid support.

INSTALL.md

@@ -130,7 +130,7 @@ _**NOTE:** if you are updating Go from a older version, make sure you remove
 `/usr/local/go` before reinstalling it._
 
 ```sh
-export VERSION=1.23.5 OS=linux ARCH=amd64  # change this as you need
+export VERSION=1.24.0 OS=linux ARCH=amd64  # change this as you need
 
 wget -O /tmp/go${VERSION}.${OS}-${ARCH}.tar.gz \
   https://dl.google.com/go/go${VERSION}.${OS}-${ARCH}.tar.gz

LICENSE_DEPENDENCIES.md

@@ -1040,6 +1040,36 @@ SOFTWARE.
 ```
 
 
+## github.com/ccoveille/go-safecast
+
+**License:** MIT
+
+```
+MIT License
+
+Copyright (c) 2024 ccoVeille
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+```
+
+
 ## github.com/cenkalti/backoff/v4
 
 **License:** MIT

cmd/internal/cli/build_linux.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2020, Control Command Inc. All rights reserved.
-// Copyright (c) 2018-2023, Sylabs Inc. All rights reserved.
+// Copyright (c) 2018-2025, Sylabs Inc. All rights reserved.
 // Copyright (c) Contributors to the Apptainer project, established as
 //   Apptainer a Series of LF Projects LLC.
 // This software is licensed under a 3-clause BSD license. Please consult the
@@ -18,6 +18,7 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/ccoveille/go-safecast"
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/spf13/cobra"
 	keyclient "github.com/sylabs/scs-key-client/client"
@@ -74,7 +75,11 @@ func fakerootExec() {
 		}
 	}
 
-	user, err := user.GetPwUID(uint32(os.Getuid()))
+	uid, err := safecast.ToUint32(os.Getuid())
+	if err != nil {
+		sylog.Fatalf("while getting uid: %v", err)
+	}
+	user, err := user.GetPwUID(uid)
 	if err != nil {
 		sylog.Fatalf("failed to retrieve user information: %s", err)
 	}

cmd/internal/cli/cgroups.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2022-2025, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ccoveille/go-safecast"
 	"github.com/docker/go-units"
 	"github.com/shopspring/decimal"
 	"github.com/sylabs/singularity/v4/internal/pkg/cgroups"
@@ -198,9 +199,14 @@ func getCPULimits() (*cgroups.LinuxCPU, error) {
 			return nil, fmt.Errorf("cpus value must be in range %s - %s", minCPU.String(), maxCPU.String())
 		}
 
-		nanoCPUs := dCpus.Mul(decimal.NewFromInt(1e9)).IntPart()
-
-		quota := nanoCPUs * int64(period) / 1e9
+		nanoCPUs, err := safecast.ToUint64(dCpus.Mul(decimal.NewFromInt(1e9)).IntPart())
+		if err != nil {
+			return nil, err
+		}
+		quota, err := safecast.ToInt64(nanoCPUs * period / 1e9)
+		if err != nil {
+			return nil, err
+		}
 		cpu.Period = &period
 		cpu.Quota = &quota
 		configured = true

cmd/internal/cli/keyserver.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2023, Sylabs Inc. All rights reserved.
+// Copyright (c) 2019-2025, Sylabs Inc. All rights reserved.
 // Copyright (c) 2020, Control Command Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
@@ -170,7 +170,7 @@ var KeyserverRemoveCmd = &cobra.Command{
 }
 
 func setKeyserver(_ *cobra.Command, _ []string) {
-	if uint32(os.Getuid()) != 0 {
+	if os.Getuid() != 0 {
 		sylog.Fatalf("Unable to modify keyserver configuration: not root user")
 	}
 }

cmd/internal/cli/remote.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2023, Sylabs Inc. All rights reserved.
+// Copyright (c) 2019-2025, Sylabs Inc. All rights reserved.
 // Copyright (c) 2020, Control Command Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
@@ -203,8 +203,7 @@ func setGlobalRemoteConfig(_ *cobra.Command, _ []string) {
 		return
 	}
 
-	uid := uint32(os.Getuid())
-	if uid != 0 {
+	if os.Getuid() != 0 {
 		sylog.Fatalf("Unable to modify global endpoint configuration file: not root user")
 	}
 

docs/remote.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2024, Sylabs Inc. All rights reserved.
+// Copyright (c) 2019-2025, Sylabs Inc. All rights reserved.
 // Copyright (c) 2020, Control Command Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
@@ -40,10 +40,10 @@ const (
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// remote get-login-password
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	RemoteGetLoginPasswordUse     string = `get-login-password` //nolint:gosec
+	RemoteGetLoginPasswordUse     string = `get-login-password`
 	RemoteGetLoginPasswordShort   string = `Retrieves the cli secret for the currently logged in user`
 	RemoteGetLoginPasswordLong    string = `The 'remote get-login-password' command allows you to retrieve the cli secret for the currently user.`
-	RemoteGetLoginPasswordExample string = `$ singularity remote get-login-password | docker login -u user --password-stdin https://harbor.sylabs.io` //nolint:gosec
+	RemoteGetLoginPasswordExample string = `$ singularity remote get-login-password | docker login -u user --password-stdin https://harbor.sylabs.io`
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// remote add command
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~