Fix RPM package download routing & Fix missing package version count

Author: ExplodingDragon

routers/api/packages/api.go

@@ -467,8 +467,8 @@ func CommonRoutes() *web.Router {
 			g.MatchPath("HEAD", "/<group:*>/repodata/<filename>", rpm.CheckRepositoryFileExistence)
 			g.MatchPath("GET", "/<group:*>/repodata/<filename>", rpm.GetRepositoryFile)
 			g.MatchPath("PUT", "/<group:*>/upload", reqPackageAccess(perm.AccessModeWrite), rpm.UploadPackageFile)
-			g.MatchPath("HEAD,GET", "/<group:*>/package/<name>/<version>/<architecture>", rpm.DownloadPackageFile)
-			g.MatchPath("DELETE", "/<group:*>/package/<name>/<version>/<architecture>", reqPackageAccess(perm.AccessModeWrite), rpm.DeletePackageFile)
+			g.MatchPath("HEAD,GET", "/<group:*>/package/<name>/<version>/<architecture>/<*>", rpm.DownloadPackageFile)
+			g.MatchPath("DELETE", "/<group:*>/package/<name>/<version>/<architecture>/<*>", reqPackageAccess(perm.AccessModeWrite), rpm.DeletePackageFile)
 		}, reqPackageAccess(perm.AccessModeRead))
 
 		r.Group("/rubygems", func() {

routers/web/user/package.go

@@ -301,16 +301,17 @@ func ViewPackageVersion(ctx *context.Context) {
 			PackageID: pd.Package.ID,
 			IsTagged:  true,
 		})
-	default:
+	}
+	if pd.Package.Type != packages_model.TypeContainer {
 		pvs, pvsTotal, err = packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{
 			Paginator:  db.NewAbsoluteListOptions(0, 5),
 			PackageID:  pd.Package.ID,
 			IsInternal: optional.Some(false),
 		})
-	}
-	if err != nil {
-		ctx.ServerError("", err)
-		return
+		if err != nil {
+			ctx.ServerError("", err)
+			return
+		}
 	}
 
 	ctx.Data["LatestVersions"] = pvs

tests/integration/api_packages_rpm_test.go

@@ -157,7 +157,8 @@ gpgkey=%sapi/packages/%s/rpm/repository.key`,
 			t.Run("Download", func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
 
-				req := NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s", groupURL, packageName, packageVersion, packageArchitecture))
+				rpmFileName := fmt.Sprintf("%s-%s-%s.rpm", packageName, packageVersion, packageArchitecture)
+				req := NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s/%s", groupURL, packageName, packageVersion, packageArchitecture, rpmFileName))
 				resp := MakeRequest(t, req, http.StatusOK)
 
 				assert.Equal(t, content, resp.Body.Bytes())