update

Signed-off-by: Patrick Zheng <[email protected]>
notaryproject · Jan 10, 2024 · 4d40f81 · 4d40f81
1 parent 48ff47f
commit 4d40f81
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/plugin/manager_test.go b/plugin/manager_test.go
@@ -593,32 +593,22 @@ func TestManager_Uninstall(t *testing.T) {
 }
 
 func TestParsePluginName(t *testing.T) {
-	pluginName, err := parsePluginName("notation-my-plugin")
-	if err != nil {
-		t.Fatalf("expected nil err, but got %v", err)
-	}
-	if pluginName != "my-plugin" {
-		t.Fatalf("expected plugin name my-plugin, but got %s", pluginName)
-	}
-
 	if runtime.GOOS == "windows" {
-		pluginName, err = parsePluginName("notation-my-plugin.exe")
+		pluginName, err := parsePluginName("notation-my-plugin.exe")
 		if err != nil {
 			t.Fatalf("expected nil err, but got %v", err)
 		}
 		if pluginName != "my-plugin" {
 			t.Fatalf("expected plugin name my-plugin, but got %s", pluginName)
 		}
 
-		pluginName, err = parsePluginName("notation-com.plugin")
-		if err != nil {
-			t.Fatalf("expected nil err, but got %v", err)
-		}
-		if pluginName != "com.plugin" {
-			t.Fatalf("expected plugin name com.plugin, but got %s", pluginName)
+		expectedErrorMsg := "invalid plugin executable file name. Plugin file name requires format notation-{plugin-name}.exe, but got notation-com.plugin"
+		_, err = parsePluginName("notation-com.plugin")
+		if err == nil || err.Error() != expectedErrorMsg {
+			t.Fatalf("expected %s, but got %v", expectedErrorMsg, err)
 		}
 
-		expectedErrorMsg := "invalid plugin executable file name. Plugin file name requires format notation-{plugin-name}.exe, but got my-plugin.exe"
+		expectedErrorMsg = "invalid plugin executable file name. Plugin file name requires format notation-{plugin-name}.exe, but got my-plugin.exe"
 		_, err = parsePluginName("my-plugin.exe")
 		if err == nil || err.Error() != expectedErrorMsg {
 			t.Fatalf("expected %s, but got %v", expectedErrorMsg, err)
@@ -636,6 +626,14 @@ func TestParsePluginName(t *testing.T) {
 			t.Fatalf("expected %s, but got %v", expectedErrorMsg, err)
 		}
 	} else {
+		pluginName, err := parsePluginName("notation-my-plugin")
+		if err != nil {
+			t.Fatalf("expected nil err, but got %v", err)
+		}
+		if pluginName != "my-plugin" {
+			t.Fatalf("expected plugin name my-plugin, but got %s", pluginName)
+		}
+
 		pluginName, err = parsePluginName("notation-com.example.plugin")
 		if err != nil {
 			t.Fatalf("expected nil err, but got %v", err)

diff --git a/plugin/manager_windows.go b/plugin/manager_windows.go
@@ -42,10 +42,10 @@ func isExecutableFile(filePath string) (bool, error) {
 // parsePluginName checks if fileName is a valid plugin file name
 // and gets plugin name from it based on spec: https://github.com/notaryproject/specifications/blob/main/specs/plugin-extensibility.md#installation
 func parsePluginName(fileName string) (string, error) {
-	fname := fileName
-	if strings.EqualFold(filepath.Ext(fileName), ".exe") {
-		fname = file.TrimFileExtension(fileName)
+	if !strings.EqualFold(filepath.Ext(fileName), ".exe") {
+		return "", fmt.Errorf("invalid plugin executable file name. Plugin file name requires format notation-{plugin-name}.exe, but got %s", fileName)
 	}
+	fname := file.TrimFileExtension(fileName)
 	pluginName, found := strings.CutPrefix(fname, proto.Prefix)
 	if !found || pluginName == "" {
 		return "", fmt.Errorf("invalid plugin executable file name. Plugin file name requires format notation-{plugin-name}.exe, but got %s", fileName)