Upstream: <carry>: Use clean binary names in download server

Replace versioned binary names (oadp-vmdp_${VERSION}_${os}_${arch})
with clean names (oadp-vmdp_${os}_${arch}) so users can directly
curl/wget binaries without version/commit hash in the filename.
Switch from single sha256sum.txt to per-file .sha256 sidecar checksums.
Add LICENSE as a downloadable file on the download server page.

Similar to migtools/oadp-cli#174

Co-authored-by: Claude <noreply@anthropic.com>
Signed-off-by: Michal Pryc <mpryc@redhat.com>

Author: mpryc

Containerfile.download

@@ -52,16 +52,16 @@ RUN go mod download && go mod verify
 COPY . .
 
 # Build oadp-vmdp binaries for all target platforms as direct executables
-# Binaries are statically linked so no archive wrapping is needed
-# SHA256 checksums are generated for integrity verification
+# with clean names (no version/commit hash) for direct curl/wget download.
+# Per-file SHA256 checksums are generated for integrity verification.
 RUN mkdir -p /archives && \
     for platform in linux/amd64 linux/arm64 windows/amd64 windows/arm64; do \
         os=$(echo $platform | cut -d'/' -f1); \
         arch=$(echo $platform | cut -d'/' -f2); \
         if [ "$os" = "windows" ]; then \
-            out_name="oadp-vmdp_${VERSION}_${os}_${arch}.exe"; \
+            out_name="oadp-vmdp_${os}_${arch}.exe"; \
         else \
-            out_name="oadp-vmdp_${VERSION}_${os}_${arch}"; \
+            out_name="oadp-vmdp_${os}_${arch}"; \
         fi; \
         echo "Building oadp-vmdp for ${os}/${arch}..."; \
         CGO_ENABLED=0 GOOS=$os GOARCH=$arch \
@@ -73,8 +73,9 @@ RUN mkdir -p /archives && \
                 -X github.com/kopia/kopia/repo.BuildGitHubRepo=github.com/openshift/oadp-vmdp" \
             -o /archives/$out_name \
             . ; \
+        sha256sum /archives/$out_name > /archives/$out_name.sha256; \
     done && \
-    cd /archives && sha256sum oadp-vmdp_* > sha256sum.txt && \
+    cp LICENSE /archives/LICENSE && \
     rm -rf /root/.cache/go-build /tmp/*
 
 # Build the download server for the TARGET platform (the arch this container will run on)

cmd/downloads/server.go

@@ -15,8 +15,8 @@ import (
 )
 
 const (
-	checksumFile     = "sha256sum.txt"
 	binaryPrefix     = "oadp-vmdp_"
+	licenseFile      = "LICENSE"
 	bytesPerMB       = 1024 * 1024
 	minPlatformParts = 3
 	readTimeout      = 10 * time.Second
@@ -30,7 +30,7 @@ var templateFS embed.FS
 var staticFS embed.FS
 
 var (
-	archiveDir   = getEnv("ARCHIVE_DIR", "/archives")
+	binaryDir    = getEnv("ARCHIVE_DIR", "/archives")
 	port         = getEnv("PORT", "8080")
 	pageTemplate = template.Must(template.ParseFS(templateFS, "templates/index.html"))
 )
@@ -43,7 +43,7 @@ func getEnv(key, fallback string) string {
 	return fallback
 }
 
-type archiveFile struct {
+type binaryFile struct {
 	Name     string
 	Size     float64
 	OS       string
@@ -52,12 +52,12 @@ type archiveFile struct {
 }
 
 func main() {
-	files, err := listBinaryFiles()
+	files, err := discoverBinaries()
 	if err != nil || len(files) == 0 {
-		log.Fatal("No downloadable files found in ", archiveDir)
+		log.Fatal("No binaries found in ", binaryDir)
 	}
 
-	log.Printf("Found %d downloadable files", len(files))
+	log.Printf("Found %d binaries", len(files))
 
 	staticContent, err := fs.Sub(staticFS, "static")
 	if err != nil {
@@ -69,7 +69,7 @@ func main() {
 	http.HandleFunc("/download/", downloadBinary)
 
 	log.Printf("Starting server on port %s", port)
-	log.Printf("Serving files from %s", archiveDir)
+	log.Printf("Serving binaries from %s", binaryDir)
 
 	srv := &http.Server{
 		Addr:         ":" + port,
@@ -82,66 +82,47 @@ func main() {
 	}
 }
 
-// listBinaryFiles returns all downloadable files (excludes sha256sum.txt and .sha256 sidecars).
-func listBinaryFiles() ([]string, error) {
-	entries, err := os.ReadDir(archiveDir)
+// discoverBinaries finds oadp-vmdp binaries (excluding .sha256 and LICENSE files).
+func discoverBinaries() ([]string, error) {
+	entries, err := os.ReadDir(binaryDir)
 	if err != nil {
-		return nil, fmt.Errorf("reading archive directory: %w", err)
+		return nil, fmt.Errorf("reading binary directory: %w", err)
 	}
 
-	var files []string
+	var binaries []string
 
 	for _, e := range entries {
-		if e.IsDir() {
+		name := e.Name()
+
+		if e.IsDir() || strings.HasSuffix(name, ".sha256") || name == licenseFile {
 			continue
 		}
 
-		name := e.Name()
-
-		if strings.HasPrefix(name, binaryPrefix) &&
-			!strings.HasSuffix(name, ".sha256") &&
-			name != checksumFile {
-			files = append(files, filepath.Join(archiveDir, name))
+		if strings.HasPrefix(name, binaryPrefix) {
+			binaries = append(binaries, filepath.Join(binaryDir, name))
 		}
 	}
 
-	return files, nil
+	return binaries, nil
 }
 
-// readChecksum reads a SHA256 checksum from a .sha256 sidecar file or
-// falls back to looking up the filename in sha256sum.txt.
+// readChecksum reads a SHA256 checksum from a per-file .sha256 sidecar file.
 func readChecksum(filePath string) string {
-	// Try per-file .sha256 sidecar first (oadp-cli style).
-	data, err := os.ReadFile(filePath + ".sha256") //nolint:gosec // path is constructed from archiveDir constant
-	if err == nil {
-		fields := strings.Fields(string(data))
-		if len(fields) > 0 {
-			return fields[0]
-		}
-	}
-
-	// Fall back to sha256sum.txt.
-	sumFile := filepath.Join(filepath.Dir(filePath), checksumFile)
-
-	data, err = os.ReadFile(sumFile) //nolint:gosec // path is constructed from archiveDir constant
+	data, err := os.ReadFile(filePath + ".sha256") //nolint:gosec // path is constructed from binaryDir constant
 	if err != nil {
 		return ""
 	}
 
-	base := filepath.Base(filePath)
-
-	for line := range strings.SplitSeq(strings.TrimSpace(string(data)), "\n") {
-		fields := strings.Fields(line)
-		if len(fields) == 2 && fields[1] == base {
-			return fields[0]
-		}
+	fields := strings.Fields(string(data))
+	if len(fields) > 0 {
+		return fields[0]
 	}
 
 	return ""
 }
 
 // parsePlatform extracts OS and architecture from a filename like
-// oadp-vmdp_v1.0.0_linux_amd64 or oadp-vmdp_v1.0.0_windows_arm64.exe.
+// oadp-vmdp_linux_amd64 or oadp-vmdp_windows_arm64.exe.
 func parsePlatform(filename string) (string, string) {
 	name := strings.TrimSuffix(filename, ".exe")
 
@@ -154,13 +135,18 @@ func parsePlatform(filename string) (string, string) {
 }
 
 func listBinaries(w http.ResponseWriter, _ *http.Request) {
-	files, err := listBinaryFiles()
+	files, err := discoverBinaries()
 	if err != nil {
-		http.Error(w, "Error listing files", http.StatusInternalServerError)
+		http.Error(w, "Error listing binaries", http.StatusInternalServerError)
 		return
 	}
 
-	var linuxFiles, windowsFiles []archiveFile
+	hasLicense := false
+	if _, err := os.Stat(filepath.Join(binaryDir, licenseFile)); err == nil {
+		hasLicense = true
+	}
+
+	var linuxFiles, windowsFiles []binaryFile
 
 	for _, file := range files {
 		name := filepath.Base(file)
@@ -174,20 +160,21 @@ func listBinaries(w http.ResponseWriter, _ *http.Request) {
 		osName, arch := parsePlatform(name)
 		checksum := readChecksum(file)
 
-		af := archiveFile{Name: name, Size: size, OS: osName, Arch: arch, Checksum: checksum}
+		bf := binaryFile{Name: name, Size: size, OS: osName, Arch: arch, Checksum: checksum}
 
 		switch osName {
 		case "linux":
-			linuxFiles = append(linuxFiles, af)
+			linuxFiles = append(linuxFiles, bf)
 		case "windows":
-			windowsFiles = append(windowsFiles, af)
+			windowsFiles = append(windowsFiles, bf)
 		}
 	}
 
 	data := struct {
-		LinuxFiles   []archiveFile
-		WindowsFiles []archiveFile
-	}{linuxFiles, windowsFiles}
+		LinuxFiles   []binaryFile
+		WindowsFiles []binaryFile
+		HasLicense   bool
+	}{linuxFiles, windowsFiles, hasLicense}
 
 	w.Header().Set("Content-Type", "text/html")
 
@@ -199,18 +186,18 @@ func listBinaries(w http.ResponseWriter, _ *http.Request) {
 func downloadBinary(w http.ResponseWriter, r *http.Request) {
 	filename := filepath.Base(r.URL.Path[len("/download/"):])
 
-	// Security: only allow known file prefixes and the checksum file.
+	// Security: only allow known file prefixes and the LICENSE file.
 	if filepath.Dir(filename) != "." {
 		http.Error(w, "Invalid filename", http.StatusBadRequest)
 		return
 	}
 
-	if !strings.HasPrefix(filename, binaryPrefix) && filename != checksumFile {
+	if !strings.HasPrefix(filename, binaryPrefix) && filename != licenseFile {
 		http.Error(w, "Invalid filename", http.StatusBadRequest)
 		return
 	}
 
-	filePath := filepath.Join(archiveDir, filename)
+	filePath := filepath.Join(binaryDir, filename)
 
 	if _, err := os.Stat(filePath); os.IsNotExist(err) {
 		http.Error(w, "File not found", http.StatusNotFound)
@@ -219,7 +206,7 @@ func downloadBinary(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Content-Disposition", "attachment; filename="+filename)
 
-	if filename == checksumFile {
+	if filename == licenseFile {
 		w.Header().Set("Content-Type", "text/plain")
 	} else {
 		w.Header().Set("Content-Type", "application/octet-stream")

cmd/downloads/templates/index.html

@@ -72,6 +72,16 @@
     </div>
     {{end}}
 
+    {{if .HasLicense}}
+    <div class="section">
+      <div class="section-header">License</div>
+      <div style="padding: 0.85rem 1.25rem; display: flex; align-items: center; justify-content: space-between;">
+        <span style="font-size: 0.9rem;">LICENSE</span>
+        <a class="download-btn" href="/download/LICENSE">View License</a>
+      </div>
+    </div>
+    {{end}}
+
     <div class="install-section">
       <h3>Installation</h3>
 

konflux.Dockerfile

@@ -16,14 +16,15 @@ ARG BUILD_DATE=unknown
 ARG BUILDTAGS=
 
 # Build oadp-vmdp binaries for all target platforms as direct executables
+# with clean names (no version/commit hash) for direct curl/wget download.
 RUN mkdir -p /archives && \
     for platform in linux/amd64 linux/arm64 windows/amd64 windows/arm64; do \
         os=$(echo $platform | cut -d'/' -f1); \
         arch=$(echo $platform | cut -d'/' -f2); \
         if [ "$os" = "windows" ]; then \
-            out_name="oadp-vmdp_${VERSION}_${os}_${arch}.exe"; \
+            out_name="oadp-vmdp_${os}_${arch}.exe"; \
         else \
-            out_name="oadp-vmdp_${VERSION}_${os}_${arch}"; \
+            out_name="oadp-vmdp_${os}_${arch}"; \
         fi; \
         echo "Building oadp-vmdp for ${os}/${arch}..."; \
         CGO_ENABLED=0 GOOS=$os GOARCH=$arch \
@@ -35,8 +36,9 @@ RUN mkdir -p /archives && \
                 -X github.com/kopia/kopia/repo.BuildGitHubRepo=github.com/openshift/oadp-vmdp" \
             -o /archives/$out_name \
             . ; \
+        sha256sum /archives/$out_name > /archives/$out_name.sha256; \
     done && \
-    cd /archives && sha256sum oadp-vmdp_* > sha256sum.txt && \
+    cp LICENSE /archives/LICENSE && \
     rm -rf /root/.cache/go-build /tmp/*
 
 # Build the download server (FIPS-compliant)