refactor: verifier

internal/core/plugin_manager/watcher.go

@@ -14,7 +14,6 @@ import (
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_manager/positive_manager"
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_manager/remote_manager"
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/verifier"
 	"github.com/langgenius/dify-plugin-daemon/internal/types/app"
 	"github.com/langgenius/dify-plugin-daemon/internal/types/entities/plugin_entities"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
@@ -210,7 +209,7 @@ func (p *PluginManager) loadPlugin(plugin_path string) (*pluginRuntimeWithDecode
 				AbsolutePath: plugin_path,
 				WorkingPath:  plugin_working_path,
 				ActiveAt:     nil,
-				Verified:     verifier.VerifyPlugin(decoder) == nil,
+				Verified:     manifest.Verified,
 			},
 		},
 		Decoder: decoder,

internal/core/plugin_packager/decoder/decoder.go

@@ -1,15 +1,10 @@
 package decoder
 
 import (
-	"errors"
-	"fmt"
 	"io"
 	"io/fs"
-	"path/filepath"
-	"strings"
 
 	"github.com/langgenius/dify-plugin-daemon/internal/types/entities/plugin_entities"
-	"github.com/langgenius/dify-plugin-daemon/internal/utils/parser"
 )
 
 // PluginDecoder is an interface for decoding and interacting with plugin files
@@ -60,293 +55,3 @@ type PluginDecoder interface {
 	// Checksum returns the checksum of the plugin
 	Checksum() (string, error)
 }
-
-type PluginDecoderHelper struct {
-	pluginDeclaration *plugin_entities.PluginDeclaration
-	checksum          string
-}
-
-func (p *PluginDecoderHelper) Manifest(decoder PluginDecoder) (plugin_entities.PluginDeclaration, error) {
-	if p.pluginDeclaration != nil {
-		return *p.pluginDeclaration, nil
-	}
-
-	// read the manifest file
-	manifest, err := decoder.ReadFile("manifest.yaml")
-	if err != nil {
-		return plugin_entities.PluginDeclaration{}, err
-	}
-
-	dec, err := parser.UnmarshalYamlBytes[plugin_entities.PluginDeclaration](manifest)
-	if err != nil {
-		return plugin_entities.PluginDeclaration{}, err
-	}
-
-	// try to load plugins
-	plugins := dec.Plugins
-	for _, tool := range plugins.Tools {
-		// read yaml
-		plugin_yaml, err := decoder.ReadFile(tool)
-		if err != nil {
-			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read tool file: %s", tool))
-		}
-
-		plugin_dec, err := parser.UnmarshalYamlBytes[plugin_entities.ToolProviderDeclaration](plugin_yaml)
-		if err != nil {
-			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal plugin file: %s", tool))
-		}
-
-		// read tools
-		for _, tool_file := range plugin_dec.ToolFiles {
-			tool_file_content, err := decoder.ReadFile(tool_file)
-			if err != nil {
-				return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read tool file: %s", tool_file))
-			}
-
-			tool_file_dec, err := parser.UnmarshalYamlBytes[plugin_entities.ToolDeclaration](tool_file_content)
-			if err != nil {
-				return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal tool file: %s", tool_file))
-			}
-
-			plugin_dec.Tools = append(plugin_dec.Tools, tool_file_dec)
-		}
-
-		dec.Tool = &plugin_dec
-	}
-
-	for _, endpoint := range plugins.Endpoints {
-		// read yaml
-		plugin_yaml, err := decoder.ReadFile(endpoint)
-		if err != nil {
-			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read endpoint file: %s", endpoint))
-		}
-
-		plugin_dec, err := parser.UnmarshalYamlBytes[plugin_entities.EndpointProviderDeclaration](plugin_yaml)
-		if err != nil {
-			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal plugin file: %s", endpoint))
-		}
-
-		// read detailed endpoints
-		endpoints_files := plugin_dec.EndpointFiles
-
-		for _, endpoint_file := range endpoints_files {
-			endpoint_file_content, err := decoder.ReadFile(endpoint_file)
-			if err != nil {
-				return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read endpoint file: %s", endpoint_file))
-			}
-
-			endpoint_file_dec, err := parser.UnmarshalYamlBytes[plugin_entities.EndpointDeclaration](endpoint_file_content)
-			if err != nil {
-				return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal endpoint file: %s", endpoint_file))
-			}
-
-			plugin_dec.Endpoints = append(plugin_dec.Endpoints, endpoint_file_dec)
-		}
-
-		dec.Endpoint = &plugin_dec
-	}
-
-	for _, model := range plugins.Models {
-		// read yaml
-		plugin_yaml, err := decoder.ReadFile(model)
-		if err != nil {
-			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read model file: %s", model))
-		}
-
-		plugin_dec, err := parser.UnmarshalYamlBytes[plugin_entities.ModelProviderDeclaration](plugin_yaml)
-		if err != nil {
-			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal plugin file: %s", model))
-		}
-
-		// read model position file
-		if plugin_dec.PositionFiles != nil {
-			plugin_dec.Position = &plugin_entities.ModelPosition{}
-
-			llm_file_name, ok := plugin_dec.PositionFiles["llm"]
-			if ok {
-				llm_file, err := decoder.ReadFile(llm_file_name)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read llm position file: %s", llm_file_name))
-				}
-
-				position, err := parser.UnmarshalYamlBytes[[]string](llm_file)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal llm position file: %s", llm_file_name))
-				}
-
-				plugin_dec.Position.LLM = &position
-			}
-
-			text_embedding_file_name, ok := plugin_dec.PositionFiles["text_embedding"]
-			if ok {
-				text_embedding_file, err := decoder.ReadFile(text_embedding_file_name)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read text embedding position file: %s", text_embedding_file_name))
-				}
-
-				position, err := parser.UnmarshalYamlBytes[[]string](text_embedding_file)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal text embedding position file: %s", text_embedding_file_name))
-				}
-
-				plugin_dec.Position.TextEmbedding = &position
-			}
-
-			rerank_file_name, ok := plugin_dec.PositionFiles["rerank"]
-			if ok {
-				rerank_file, err := decoder.ReadFile(rerank_file_name)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read rerank position file: %s", rerank_file_name))
-				}
-
-				position, err := parser.UnmarshalYamlBytes[[]string](rerank_file)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal rerank position file: %s", rerank_file_name))
-				}
-
-				plugin_dec.Position.Rerank = &position
-			}
-
-			tts_file_name, ok := plugin_dec.PositionFiles["tts"]
-			if ok {
-				tts_file, err := decoder.ReadFile(tts_file_name)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read tts position file: %s", tts_file_name))
-				}
-
-				position, err := parser.UnmarshalYamlBytes[[]string](tts_file)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal tts position file: %s", tts_file_name))
-				}
-
-				plugin_dec.Position.TTS = &position
-			}
-
-			speech2text_file_name, ok := plugin_dec.PositionFiles["speech2text"]
-			if ok {
-				speech2text_file, err := decoder.ReadFile(speech2text_file_name)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read speech2text position file: %s", speech2text_file_name))
-				}
-
-				position, err := parser.UnmarshalYamlBytes[[]string](speech2text_file)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal speech2text position file: %s", speech2text_file_name))
-				}
-
-				plugin_dec.Position.Speech2text = &position
-			}
-
-			moderation_file_name, ok := plugin_dec.PositionFiles["moderation"]
-			if ok {
-				moderation_file, err := decoder.ReadFile(moderation_file_name)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read moderation position file: %s", moderation_file_name))
-				}
-
-				position, err := parser.UnmarshalYamlBytes[[]string](moderation_file)
-				if err != nil {
-					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal moderation position file: %s", moderation_file_name))
-				}
-
-				plugin_dec.Position.Moderation = &position
-			}
-		}
-
-		// read models
-		if err := decoder.Walk(func(filename, dir string) error {
-			model_patterns := plugin_dec.ModelFiles
-			// using glob to match if dir/filename is in models
-			model_file_name := filepath.Join(dir, filename)
-			if strings.HasSuffix(model_file_name, "_position.yaml") {
-				return nil
-			}
-
-			for _, model_pattern := range model_patterns {
-				matched, err := filepath.Match(model_pattern, model_file_name)
-				if err != nil {
-					return err
-				}
-				if matched {
-					// read model file
-					model_file, err := decoder.ReadFile(model_file_name)
-					if err != nil {
-						return err
-					}
-
-					model_dec, err := parser.UnmarshalYamlBytes[plugin_entities.ModelDeclaration](model_file)
-					if err != nil {
-						return err
-					}
-
-					plugin_dec.Models = append(plugin_dec.Models, model_dec)
-				}
-			}
-
-			return nil
-		}); err != nil {
-			return plugin_entities.PluginDeclaration{}, err
-		}
-
-		dec.Model = &plugin_dec
-	}
-
-	dec.FillInDefaultValues()
-
-	if err := dec.ManifestValidate(); err != nil {
-		return plugin_entities.PluginDeclaration{}, err
-	}
-
-	p.pluginDeclaration = &dec
-	return dec, nil
-}
-
-func (p *PluginDecoderHelper) Assets(decoder PluginDecoder) (map[string][]byte, error) {
-	files, err := decoder.ReadDir("_assets")
-	if err != nil {
-		return nil, err
-	}
-
-	assets := make(map[string][]byte)
-	for _, file := range files {
-		content, err := decoder.ReadFile(file)
-		if err != nil {
-			return nil, err
-		}
-		// trim _assets
-		file, _ = strings.CutPrefix(file, "_assets/")
-		assets[file] = content
-	}
-
-	return assets, nil
-}
-
-func (p *PluginDecoderHelper) Checksum(decoder PluginDecoder) (string, error) {
-	if p.checksum != "" {
-		return p.checksum, nil
-	}
-
-	var err error
-
-	p.checksum, err = CalculateChecksum(decoder)
-	if err != nil {
-		return "", err
-	}
-
-	return p.checksum, nil
-}
-
-func (p *PluginDecoderHelper) UniqueIdentity(decoder PluginDecoder) (plugin_entities.PluginUniqueIdentifier, error) {
-	manifest, err := decoder.Manifest()
-	if err != nil {
-		return plugin_entities.PluginUniqueIdentifier(""), err
-	}
-
-	identity := manifest.Identity()
-	checksum, err := decoder.Checksum()
-	if err != nil {
-		return plugin_entities.PluginUniqueIdentifier(""), err
-	}
-
-	return plugin_entities.NewPluginUniqueIdentifier(fmt.Sprintf("%s@%s", identity, checksum))
-}

internal/core/plugin_packager/decoder/helper.go

@@ -0,0 +1,304 @@
+package decoder
+
+import (
+	"errors"
+	"fmt"
+	"path/filepath"
+	"strings"
+
+	"github.com/langgenius/dify-plugin-daemon/internal/types/entities/plugin_entities"
+	"github.com/langgenius/dify-plugin-daemon/internal/utils/parser"
+)
+
+type PluginDecoderHelper struct {
+	pluginDeclaration *plugin_entities.PluginDeclaration
+	checksum          string
+}
+
+func (p *PluginDecoderHelper) Manifest(decoder PluginDecoder) (plugin_entities.PluginDeclaration, error) {
+	if p.pluginDeclaration != nil {
+		return *p.pluginDeclaration, nil
+	}
+
+	// read the manifest file
+	manifest, err := decoder.ReadFile("manifest.yaml")
+	if err != nil {
+		return plugin_entities.PluginDeclaration{}, err
+	}
+
+	dec, err := parser.UnmarshalYamlBytes[plugin_entities.PluginDeclaration](manifest)
+	if err != nil {
+		return plugin_entities.PluginDeclaration{}, err
+	}
+
+	// try to load plugins
+	plugins := dec.Plugins
+	for _, tool := range plugins.Tools {
+		// read yaml
+		plugin_yaml, err := decoder.ReadFile(tool)
+		if err != nil {
+			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read tool file: %s", tool))
+		}
+
+		plugin_dec, err := parser.UnmarshalYamlBytes[plugin_entities.ToolProviderDeclaration](plugin_yaml)
+		if err != nil {
+			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal plugin file: %s", tool))
+		}
+
+		// read tools
+		for _, tool_file := range plugin_dec.ToolFiles {
+			tool_file_content, err := decoder.ReadFile(tool_file)
+			if err != nil {
+				return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read tool file: %s", tool_file))
+			}
+
+			tool_file_dec, err := parser.UnmarshalYamlBytes[plugin_entities.ToolDeclaration](tool_file_content)
+			if err != nil {
+				return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal tool file: %s", tool_file))
+			}
+
+			plugin_dec.Tools = append(plugin_dec.Tools, tool_file_dec)
+		}
+
+		dec.Tool = &plugin_dec
+	}
+
+	for _, endpoint := range plugins.Endpoints {
+		// read yaml
+		plugin_yaml, err := decoder.ReadFile(endpoint)
+		if err != nil {
+			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read endpoint file: %s", endpoint))
+		}
+
+		plugin_dec, err := parser.UnmarshalYamlBytes[plugin_entities.EndpointProviderDeclaration](plugin_yaml)
+		if err != nil {
+			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal plugin file: %s", endpoint))
+		}
+
+		// read detailed endpoints
+		endpoints_files := plugin_dec.EndpointFiles
+
+		for _, endpoint_file := range endpoints_files {
+			endpoint_file_content, err := decoder.ReadFile(endpoint_file)
+			if err != nil {
+				return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read endpoint file: %s", endpoint_file))
+			}
+
+			endpoint_file_dec, err := parser.UnmarshalYamlBytes[plugin_entities.EndpointDeclaration](endpoint_file_content)
+			if err != nil {
+				return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal endpoint file: %s", endpoint_file))
+			}
+
+			plugin_dec.Endpoints = append(plugin_dec.Endpoints, endpoint_file_dec)
+		}
+
+		dec.Endpoint = &plugin_dec
+	}
+
+	for _, model := range plugins.Models {
+		// read yaml
+		plugin_yaml, err := decoder.ReadFile(model)
+		if err != nil {
+			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read model file: %s", model))
+		}
+
+		plugin_dec, err := parser.UnmarshalYamlBytes[plugin_entities.ModelProviderDeclaration](plugin_yaml)
+		if err != nil {
+			return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal plugin file: %s", model))
+		}
+
+		// read model position file
+		if plugin_dec.PositionFiles != nil {
+			plugin_dec.Position = &plugin_entities.ModelPosition{}
+
+			llm_file_name, ok := plugin_dec.PositionFiles["llm"]
+			if ok {
+				llm_file, err := decoder.ReadFile(llm_file_name)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read llm position file: %s", llm_file_name))
+				}
+
+				position, err := parser.UnmarshalYamlBytes[[]string](llm_file)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal llm position file: %s", llm_file_name))
+				}
+
+				plugin_dec.Position.LLM = &position
+			}
+
+			text_embedding_file_name, ok := plugin_dec.PositionFiles["text_embedding"]
+			if ok {
+				text_embedding_file, err := decoder.ReadFile(text_embedding_file_name)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read text embedding position file: %s", text_embedding_file_name))
+				}
+
+				position, err := parser.UnmarshalYamlBytes[[]string](text_embedding_file)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal text embedding position file: %s", text_embedding_file_name))
+				}
+
+				plugin_dec.Position.TextEmbedding = &position
+			}
+
+			rerank_file_name, ok := plugin_dec.PositionFiles["rerank"]
+			if ok {
+				rerank_file, err := decoder.ReadFile(rerank_file_name)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read rerank position file: %s", rerank_file_name))
+				}
+
+				position, err := parser.UnmarshalYamlBytes[[]string](rerank_file)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal rerank position file: %s", rerank_file_name))
+				}
+
+				plugin_dec.Position.Rerank = &position
+			}
+
+			tts_file_name, ok := plugin_dec.PositionFiles["tts"]
+			if ok {
+				tts_file, err := decoder.ReadFile(tts_file_name)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read tts position file: %s", tts_file_name))
+				}
+
+				position, err := parser.UnmarshalYamlBytes[[]string](tts_file)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal tts position file: %s", tts_file_name))
+				}
+
+				plugin_dec.Position.TTS = &position
+			}
+
+			speech2text_file_name, ok := plugin_dec.PositionFiles["speech2text"]
+			if ok {
+				speech2text_file, err := decoder.ReadFile(speech2text_file_name)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read speech2text position file: %s", speech2text_file_name))
+				}
+
+				position, err := parser.UnmarshalYamlBytes[[]string](speech2text_file)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal speech2text position file: %s", speech2text_file_name))
+				}
+
+				plugin_dec.Position.Speech2text = &position
+			}
+
+			moderation_file_name, ok := plugin_dec.PositionFiles["moderation"]
+			if ok {
+				moderation_file, err := decoder.ReadFile(moderation_file_name)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to read moderation position file: %s", moderation_file_name))
+				}
+
+				position, err := parser.UnmarshalYamlBytes[[]string](moderation_file)
+				if err != nil {
+					return plugin_entities.PluginDeclaration{}, errors.Join(err, fmt.Errorf("failed to unmarshal moderation position file: %s", moderation_file_name))
+				}
+
+				plugin_dec.Position.Moderation = &position
+			}
+		}
+
+		// read models
+		if err := decoder.Walk(func(filename, dir string) error {
+			model_patterns := plugin_dec.ModelFiles
+			// using glob to match if dir/filename is in models
+			model_file_name := filepath.Join(dir, filename)
+			if strings.HasSuffix(model_file_name, "_position.yaml") {
+				return nil
+			}
+
+			for _, model_pattern := range model_patterns {
+				matched, err := filepath.Match(model_pattern, model_file_name)
+				if err != nil {
+					return err
+				}
+				if matched {
+					// read model file
+					model_file, err := decoder.ReadFile(model_file_name)
+					if err != nil {
+						return err
+					}
+
+					model_dec, err := parser.UnmarshalYamlBytes[plugin_entities.ModelDeclaration](model_file)
+					if err != nil {
+						return err
+					}
+
+					plugin_dec.Models = append(plugin_dec.Models, model_dec)
+				}
+			}
+
+			return nil
+		}); err != nil {
+			return plugin_entities.PluginDeclaration{}, err
+		}
+
+		dec.Model = &plugin_dec
+	}
+
+	dec.FillInDefaultValues()
+
+	// verify signature
+	dec.Verified = VerifyPlugin(decoder) == nil
+
+	if err := dec.ManifestValidate(); err != nil {
+		return plugin_entities.PluginDeclaration{}, err
+	}
+
+	p.pluginDeclaration = &dec
+	return dec, nil
+}
+
+func (p *PluginDecoderHelper) Assets(decoder PluginDecoder) (map[string][]byte, error) {
+	files, err := decoder.ReadDir("_assets")
+	if err != nil {
+		return nil, err
+	}
+
+	assets := make(map[string][]byte)
+	for _, file := range files {
+		content, err := decoder.ReadFile(file)
+		if err != nil {
+			return nil, err
+		}
+		// trim _assets
+		file, _ = strings.CutPrefix(file, "_assets/")
+		assets[file] = content
+	}
+
+	return assets, nil
+}
+
+func (p *PluginDecoderHelper) Checksum(decoder_instance PluginDecoder) (string, error) {
+	if p.checksum != "" {
+		return p.checksum, nil
+	}
+
+	var err error
+
+	p.checksum, err = CalculateChecksum(decoder_instance)
+	if err != nil {
+		return "", err
+	}
+
+	return p.checksum, nil
+}
+
+func (p *PluginDecoderHelper) UniqueIdentity(decoder PluginDecoder) (plugin_entities.PluginUniqueIdentifier, error) {
+	manifest, err := decoder.Manifest()
+	if err != nil {
+		return plugin_entities.PluginUniqueIdentifier(""), err
+	}
+
+	identity := manifest.Identity()
+	checksum, err := decoder.Checksum()
+	if err != nil {
+		return plugin_entities.PluginUniqueIdentifier(""), err
+	}
+
+	return plugin_entities.NewPluginUniqueIdentifier(fmt.Sprintf("%s@%s", identity, checksum))
+}

internal/core/plugin_packager/verifier/verifier.go

@@ -1,4 +1,4 @@
-package verifier
+package decoder
 
 import (
 	"bytes"
@@ -8,13 +8,12 @@ import (
 	"strconv"
 
 	"github.com/langgenius/dify-plugin-daemon/internal/core/license/public_key"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/encryption"
 )
 
 // VerifyPlugin is a function that verifies the signature of a plugin
 // It takes a plugin decoder and verifies the signature
-func VerifyPlugin(decoder decoder.PluginDecoder) error {
+func VerifyPlugin(decoder PluginDecoder) error {
 	// load public key
 	public_key, err := encryption.LoadPublicKey(public_key.PUBLIC_KEY)
 	if err != nil {

internal/core/plugin_packager/packager_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/packager"
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/signer"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/verifier"
 )
 
 //go:embed manifest.yaml
@@ -137,7 +136,7 @@ func TestPackagerAndVerifier(t *testing.T) {
 	}
 
 	// verify
-	err = verifier.VerifyPlugin(signed_decoder)
+	err = decoder.VerifyPlugin(signed_decoder)
 	if err != nil {
 		t.Errorf("failed to verify: %s", err.Error())
 		return
@@ -200,7 +199,7 @@ func TestWrongSign(t *testing.T) {
 	}
 
 	// verify
-	err = verifier.VerifyPlugin(signed_decoder)
+	err = decoder.VerifyPlugin(signed_decoder)
 	if err == nil {
 		t.Errorf("should fail to verify")
 		return

internal/service/plugin_decoder.go

@@ -8,7 +8,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_manager"
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/verifier"
 	"github.com/langgenius/dify-plugin-daemon/internal/types/app"
 	"github.com/langgenius/dify-plugin-daemon/internal/types/entities"
 	"github.com/langgenius/dify-plugin-daemon/internal/types/entities/plugin_entities"
@@ -32,9 +31,13 @@ func UploadPluginFromPkg(
 		return entities.NewErrorResponse(-500, err.Error())
 	}
 
+	manifest, err := decoder.Manifest()
+	if err != nil {
+		return entities.NewErrorResponse(-500, err.Error())
+	}
+
 	if config.ForceVerifyingSignature || verify_signature {
-		err := verifier.VerifyPlugin(decoder)
-		if err != nil {
+		if !manifest.Verified {
 			return entities.NewErrorResponse(-500, errors.Join(err, errors.New(
 				"plugin verification has been enabled, and the plugin you want to install has a bad signature",
 			)).Error())

internal/types/entities/plugin_entities/plugin_declaration.go

@@ -148,6 +148,7 @@ type PluginDeclarationWithoutAdvancedFields struct {
 
 type PluginDeclaration struct {
 	PluginDeclarationWithoutAdvancedFields `yaml:",inline"`
+	Verified                               bool                         `json:"verified" yaml:"verified"`
 	Endpoint                               *EndpointProviderDeclaration `json:"endpoint,omitempty" yaml:"endpoint,omitempty" validate:"omitempty"`
 	Model                                  *ModelProviderDeclaration    `json:"model,omitempty" yaml:"model,omitempty" validate:"omitempty"`
 	Tool                                   *ToolProviderDeclaration     `json:"tool,omitempty" yaml:"tool,omitempty" validate:"omitempty"`