Merge pull request #150 from amartin120/info-type-filter

add simple type filter to store info

README.md

@@ -15,10 +15,10 @@ For more information, please review the **[Hauler Documentation](https://rancher
 ### Linux/Darwin
 ```bash
 # install latest release
-curl -sfL https://get.hauler.dev | sh
+curl -sfL https://get.hauler.dev | bash
 
 # install specific release
-curl -sfL https://get.hauler.dev | HAULER_VERSION=0.4.0 sh
+curl -sfL https://get.hauler.dev | HAULER_VERSION=0.4.1 bash
 ```
 
 ### Windows

cmd/hauler/cli/store.go

@@ -3,6 +3,7 @@ package cli
 import (
 	"github.com/spf13/cobra"
 	"helm.sh/helm/v3/pkg/action"
+	"fmt"
 
 	"github.com/rancherfederal/hauler/cmd/hauler/cli/store"
 )
@@ -155,6 +156,8 @@ func addStoreSave() *cobra.Command {
 func addStoreInfo() *cobra.Command {
 	o := &store.InfoOpts{RootOpts: rootStoreOpts}
 
+	var allowedValues = []string{"image", "chart", "file", "all"}
+
 	cmd := &cobra.Command{
 		Use:     "info",
 		Short:   "Print out information about the store",
@@ -167,8 +170,13 @@ func addStoreInfo() *cobra.Command {
 			if err != nil {
 				return err
 			}
-
-			return store.InfoCmd(ctx, o, s)
+			
+			for _, allowed := range allowedValues {
+				if o.TypeFilter == allowed {
+					return store.InfoCmd(ctx, o, s)
+				}
+			}
+			return fmt.Errorf("type must be one of %v", allowedValues)
 		},
 	}
 	o.AddFlags(cmd)

cmd/hauler/cli/store/info.go

@@ -22,6 +22,7 @@ type InfoOpts struct {
 	*RootOpts
 
 	OutputFormat string
+	TypeFilter   string
 	SizeUnit     string
 }
 
@@ -29,6 +30,7 @@ func (o *InfoOpts) AddFlags(cmd *cobra.Command) {
 	f := cmd.Flags()
 
 	f.StringVarP(&o.OutputFormat, "output", "o", "table", "Output format (table, json)")
+	f.StringVarP(&o.TypeFilter, "type", "t", "all", "Filter on type (image, chart, file)")
 
 	// TODO: Regex/globbing
 }
@@ -64,7 +66,7 @@ func InfoCmd(ctx context.Context, o *InfoOpts, s *store.Layout) error {
 					return err
 				}
 
-				i := newItem(s, desc, internalManifest, internalDesc.Platform.Architecture)
+				i := newItem(s, desc, internalManifest, internalDesc.Platform.Architecture, o)
 				var emptyItem item
 				if i != emptyItem {
 					items = append(items, i)
@@ -89,7 +91,7 @@ func InfoCmd(ctx context.Context, o *InfoOpts, s *store.Layout) error {
 				return err
 			}
 
-			i := newItem(s, desc, m, internalManifest.Architecture)
+			i := newItem(s, desc, m, internalManifest.Architecture, o)
 			var emptyItem item
 			if i != emptyItem {
 				items = append(items, i)
@@ -101,7 +103,7 @@ func InfoCmd(ctx context.Context, o *InfoOpts, s *store.Layout) error {
 				return err
 			}
 
-			i := newItem(s, desc, m, "-")
+			i := newItem(s, desc, m, "-", o)
 			var emptyItem item
 			if i != emptyItem {
 				items = append(items, i)
@@ -177,7 +179,7 @@ func (a byReferenceAndArch) Less(i, j int) bool {
 	return a[i].Reference < a[j].Reference
 }
 
-func newItem(s *store.Layout, desc ocispec.Descriptor, m ocispec.Manifest, arch string) item {
+func newItem(s *store.Layout, desc ocispec.Descriptor, m ocispec.Manifest, arch string, o *InfoOpts) item {
 	// skip listing cosign items
 	if desc.Annotations["kind"] == "dev.cosignproject.cosign/atts" ||
 		desc.Annotations["kind"] == "dev.cosignproject.cosign/sigs" ||
@@ -208,6 +210,10 @@ func newItem(s *store.Layout, desc ocispec.Descriptor, m ocispec.Manifest, arch
 		return item{}
 	}
 
+	if o.TypeFilter != "all" && ctype != o.TypeFilter {
+		return item{}
+	}
+
 	return item{
 		Reference:    ref.Name(),
 		Type:         ctype,

cmd/hauler/cli/store/serve.go

@@ -95,6 +95,10 @@ func (o *ServeOpts) defaultConfig() *configuration.Configuration {
 			// "maintenance": configuration.Parameters{"readonly.enabled": false},
 		},
 	}
+
+	// Add validation configuration
+	cfg.Validation.Manifests.URLs.Allow = []string{".+"}
+
 	cfg.Log.Level = "info"
 	cfg.HTTP.Addr = fmt.Sprintf(":%d", o.Port)
 	cfg.HTTP.Headers = http.Header{

install.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 # Usage:
-#   - curl -sfL... | ENV_VAR=... sh
-#   - ENV_VAR=... sh ./install.sh
+#   - curl -sfL... | ENV_VAR=... bash
+#   - ENV_VAR=... bash ./install.sh
 #   - ./install.sh ENV_VAR=...
 
 # Example:
 #   Install Latest Release
-#     - curl -sfL https://get.hauler.dev | sh
+#     - curl -sfL https://get.hauler.dev | bash
 #   Install Specific Release
-#     - curl -sfL https://get.hauler.dev | HAULER_VERSION=0.4.0 sh
+#     - curl -sfL https://get.hauler.dev | HAULER_VERSION=0.4.1 bash
 
 # Documentation:
 #   - https://hauler.dev
@@ -34,7 +34,7 @@ function fatal {
 }
 
 # check for required dependencies
-dependencies=("curl" "awk" "openssl" "tar" "sudo" "mv" "rm")
+dependencies=("curl" "awk" "openssl" "tar" "rm")
 
 for cmd in "${dependencies[@]}"; do
     if ! command -v "$cmd" &> /dev/null; then
@@ -46,7 +46,7 @@ done
 info "Starting Installation..."
 
 # set version with an environment variable
-version=${HAULER_VERSION:-0.4.0}
+version=${HAULER_VERSION:-0.4.1}
 
 # set verision with an argument
 while [[ $# -gt 0 ]]; do
@@ -109,36 +109,41 @@ info "Starting Checksum Verification..."
 
 # Verify the Hauler checksum
 expected_checksum=$(awk -v version="$version" -v platform="$platform" -v arch="$arch" '$2 == "hauler_"version"_"platform"_"arch".tar.gz" {print $1}' "hauler_${version}_checksums.txt")
+determined_checksum=$(openssl dgst -sha256 "hauler_${version}_${platform}_${arch}.tar.gz" | awk '{print $2}')
+
 if [ -z "$expected_checksum" ]; then
     fatal "Failed to Locate Checksum: hauler_${version}_${platform}_${arch}.tar.gz"
+elif [ "$determined_checksum" = "$expected_checksum" ]; then
+    verbose "- Expected Checksum: $expected_checksum"
+    verbose "- Determined Checksum: $determined_checksum"
+    verbose "- Successfully Verified Checksum: hauler_${version}_${platform}_${arch}.tar.gz"
+else
+    verbose "- Expected: $expected_checksum"
+    verbose "- Determined: $determined_checksum"
+    fatal "Failed Checksum Verification: hauler_${version}_${platform}_${arch}.tar.gz"
 fi
 
-determined_checksum=$(openssl dgst -sha256 "hauler_${version}_${platform}_${arch}.tar.gz" | awk '{print $2}')
-if [ "$determined_checksum" != "$expected_checksum" ]; then
-    fatal "Failed to Verify Checksum: Expected: $expected_checksum - Determined: $determined_checksum"
-fi
-
-# hauler checksum verified
-verbose "- Successfully Verified Checksum"
-
 # uncompress the archive
 tar -xzf "hauler_${version}_${platform}_${arch}.tar.gz" || fatal "Failed to Extract: hauler_${version}_${platform}_${arch}.tar.gz"
 
 # install the binary
 case "$platform" in
     linux)
-        sudo mv hauler /usr/local/bin || fatal "Failed to Move: hauler to /usr/local/bin"
+        install hauler /usr/local/bin || fatal "Failed to Install Hauler to /usr/local/bin"
         ;;
     darwin)
-        sudo mv hauler /usr/local/bin || fatal "Failed to Move: hauler to /usr/local/bin"
+        install hauler /usr/local/bin || fatal "Failed to Install Hauler to /usr/local/bin"
         ;;
     *)
-        fatal "Unsupported Platform/Architecture: $platform/$arch"
+        fatal "Unsupported Platform or Architecture: $platform/$arch"
         ;;
 esac
 
-# clean up the files
-rm "hauler_${version}_checksums.txt" "hauler_${version}_${platform}_${arch}.tar.gz" || warn "Failed to Remove: hauler_${version}_checksums.txt hauler_${version}_${platform}_${arch}.tar.gz"
+# clean up checksum(s)
+rm -rf "hauler_${version}_checksums.txt" || warn "Failed to Remove: hauler_${version}_checksums.txt"
+
+# clean up archive file(s)
+rm -rf "hauler_${version}_${platform}_${arch}.tar.gz" || warn "Failed to Remove: hauler_${version}_${platform}_${arch}.tar.gz"
 
 # display success message
 info "Successfully Installed at /usr/local/bin/hauler"

internal/server/registry.go

@@ -45,6 +45,9 @@ func NewTempRegistry(ctx context.Context, root string) *tmpRegistryServer {
 			"filesystem": configuration.Parameters{"rootdirectory": root},
 		},
 	}
+	// Add validation configuration
+	cfg.Validation.Manifests.URLs.Allow = []string{".+"}
+	
 	cfg.Log.Level = "error"
 	cfg.HTTP.Headers = http.Header{
 		"X-Content-Type-Options": []string{"nosniff"},

pkg/reference/reference.go

@@ -29,7 +29,7 @@ func NewTagged(n string, tag string) (gname.Reference, error) {
 	if err != nil {
 		return nil, err
 	}
-
+	tag = strings.Replace(tag, "+", "-", -1)
 	return repo.Context().Tag(tag), nil
 }