feat(drivers): add metadata-only encryption drive 'crypt2' #1114

zhlhlf · 2025-08-20T08:59:16Z

增加只加密文件夹和文件名称不加密数据选项并且加密后保留文件后缀方便云盘可以生成缩放图
也就是上次提的希望有个叫“弱加密的驱动”
这样也就实现了名字加密避免了天翼云盘不支持的特殊语句也间接的实现了天翼云盘支持Unicode
而且还支持302重定向不走本地流量

dezhishen · 2025-08-20T09:02:36Z

crypt2 这个名字能否修改为语义化的？
例如 namecrypt ?

Copilot

Pull Request Overview

This PR adds a new "crypt2" driver that implements weak encryption for file and folder names while preserving file extensions and optionally skipping file content encryption. This enables cloud services to generate thumbnails and preview images while maintaining name-based privacy.

Key changes:

Creates a new crypt2 driver with filename-only encryption and extension preservation
Adds configuration options for selective encryption (names vs content)
Implements separate encryption methods for files and directories

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 9 comments.

File	Description
drivers/crypt2/util.go	Core encryption/decryption utilities with extension preservation
drivers/crypt2/meta.go	Driver configuration and metadata definitions
drivers/crypt2/driver.go	Main driver implementation with selective encryption logic
drivers/all.go	Registration of the new crypt2 driver

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-08-20T09:03:19Z

drivers/crypt2/util.go

+	return stdpath.Join(d.RemotePath, remoteDir, remoteFileName)
+
+}
+


The error from getEncryptedName() is ignored and not handled. If encryption fails, the function continues and may return an incorrect path.

Suggested change

func (d *Crypt) getPathForRemote(path string, isFolder bool) (remoteFullPath string) {

if isFolder && !strings.HasSuffix(path, "/") {

path = path + "/"

}

dir, fileName := filepath.Split(path)

remoteDir, err := d.getEncryptedDirName(dir)

if err != nil {

return stdpath.Join(d.RemotePath, "", "")

}

remoteFileName := ""

if len(strings.TrimSpace(fileName)) > 0 {

remoteFileName, err = d.getEncryptedName(fileName)

if err != nil {

return stdpath.Join(d.RemotePath, remoteDir, "")

}

}

return stdpath.Join(d.RemotePath, remoteDir, remoteFileName)

}

Copilot · 2025-08-20T09:03:19Z

drivers/crypt2/util.go

+func (d *Crypt) getEncryptedDirName(dirName string) (string, error) {
+    encrypted := d.cipher.EncryptDirName(dirName)
+    return encrypted, nil
+}


The function calls d.cipher.EncryptDirName() but this method doesn't exist in the rclone cipher interface. The correct method should be d.cipher.EncryptFileName().

Suggested change

}

func (d *Crypt) getEncryptedDirName(dirName string) (string, error) {

encrypted := d.cipher.EncryptFileName(dirName)

return encrypted, nil

}

Copilot · 2025-08-20T09:03:19Z

drivers/crypt2/util.go

+    ext := filepath.Ext(filename)
+    base := filename[:len(filename)-len(ext)]
+    decrypted,err := d.cipher.DecryptFileName(base)
+    return decrypted + ext, err


Missing space after comma in variable declaration. Should be 'decrypted, err'.

Suggested change

return decrypted + ext, err

decrypted, err := d.cipher.DecryptFileName(base)

return decrypted + ext, err

Copilot · 2025-08-20T09:03:20Z

drivers/crypt2/driver.go

+	if err != nil {
+		return nil, err
+	}
+	if(d.NoEncryptedFile) {


Missing space after 'if' keyword. Should be 'if (d.NoEncryptedFile)'.

Suggested change

if(d.NoEncryptedFile) {

if (d.NoEncryptedFile) {

Copilot · 2025-08-20T09:03:20Z

drivers/crypt2/driver.go

+		} else {
+			thumb, ok := model.GetThumb(obj)
+			size, err := d.cipher.DecryptedSize(obj.GetSize())
+			// 如果不进行加密文件 读取的大小应该不进行解密


[nitpick] Code comment is in Chinese. For maintainability in international projects, comments should be in English.

Suggested change

// 如果不进行加密文件读取的大小应该不进行解密

// If the file is not encrypted, the size should not be decrypted

Copilot · 2025-08-20T09:03:20Z

drivers/crypt2/driver.go

+	var size int64 = 0
+	name := ""
+	if !remoteObj.IsDir() {
+		// 如果不进行加密文件 读取的大小应该不进行解密


[nitpick] Code comment is in Chinese. For maintainability in international projects, comments should be in English.

Suggested change

// 如果不进行加密文件读取的大小应该不进行解密

// If files are not encrypted, the size should not be decrypted

Copilot · 2025-08-20T09:03:21Z

drivers/crypt2/util.go

+}
+
+// 加密文件名（保留扩展名不变）
+func (d *Crypt) getEncryptedName(filename string) (string, error) {


[nitpick] Function comment is in Chinese. For maintainability in international projects, comments should be in English.

Suggested change

func (d *Crypt) getEncryptedName(filename string) (string, error) {

// Encrypt file name (keep extension unchanged)

func (d *Crypt) getEncryptedName(filename string) (string, error) {

Copilot · 2025-08-20T09:03:21Z

drivers/crypt2/util.go

+func (d *Crypt) getEncryptedDirName(dirName string) (string, error) {
+    encrypted := d.cipher.EncryptDirName(dirName)
+    return encrypted, nil
+}


[nitpick] Function comment is in Chinese. For maintainability in international projects, comments should be in English.

Suggested change

}

// Encrypt folder name

func (d *Crypt) getEncryptedDirName(dirName string) (string, error) {

encrypted := d.cipher.EncryptDirName(dirName)

return encrypted, nil

}

Copilot · 2025-08-20T09:03:21Z

drivers/crypt2/util.go

+    ext := filepath.Ext(filename)
+    base := filename[:len(filename)-len(ext)]
+    decrypted,err := d.cipher.DecryptFileName(base)
+    return decrypted + ext, err


[nitpick] Function comment is in Chinese. For maintainability in international projects, comments should be in English.

Suggested change

return decrypted + ext, err

// Decrypts a file or directory name (for files, the extension remains unchanged)

func (d *Crypt) getDecryptedName(filename string) (string, error) {

ext := filepath.Ext(filename)

base := filename[:len(filename)-len(ext)]

decrypted,err := d.cipher.DecryptFileName(base)

return decrypted + ext, err

zhlhlf · 2025-08-20T09:08:05Z

其实不加密数据只是一个选项关闭的状态和crypt驱动一样也会加密数据所以我觉得namecrypt这个不太合适其实完全可以替代crypt只是我改了保留后缀名所以与原crypt加密的数据是不兼容的所以先取名crypt2

增加只加密文件夹和文件名称并且加密后保留文件后缀方便云盘可以生成缩放图

96d587c

dezhishen requested a review from Copilot August 20, 2025 09:01

Copilot AI reviewed Aug 20, 2025

View reviewed changes

ILoveScratch2 changed the title ~~增加只加密文件夹和文件名称不加密数据选项并且加密后保留文件后缀方便云盘可以生成缩放图~~ feat(crypt2): add metadata-only encryption drive Aug 21, 2025

zhlhlf added 2 commits August 21, 2025 13:05

Merge branch 'main' into main

1ebb04c

Merge branch 'main' into main

e7786a8

xrgzs added enhancement 增强/功能请求 go Pull requests that update go code labels Aug 24, 2025

ILoveScratch2 changed the title ~~feat(crypt2): add metadata-only encryption drive~~ feat(drivers): add metadata-only encryption drive 'crypt2' Aug 25, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

feat(drivers): add metadata-only encryption drive 'crypt2' #1114

feat(drivers): add metadata-only encryption drive 'crypt2' #1114

Uh oh!

zhlhlf commented Aug 20, 2025

Uh oh!

dezhishen commented Aug 20, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Aug 20, 2025

Uh oh!

Copilot AI Aug 20, 2025

Uh oh!

Copilot AI Aug 20, 2025

Uh oh!

Copilot AI Aug 20, 2025

Uh oh!

Copilot AI Aug 20, 2025

Uh oh!

Copilot AI Aug 20, 2025

Uh oh!

Copilot AI Aug 20, 2025

Uh oh!

Copilot AI Aug 20, 2025

Uh oh!

Copilot AI Aug 20, 2025

Uh oh!

zhlhlf commented Aug 20, 2025

Uh oh!

Uh oh!

		return stdpath.Join(d.RemotePath, remoteDir, remoteFileName)

		}

+func (d *Crypt) getPathForRemote(path string, isFolder bool) (remoteFullPath string) {
+	if isFolder && !strings.HasSuffix(path, "/") {
+		path = path + "/"
+	}
+	dir, fileName := filepath.Split(path)
+	remoteDir, err := d.getEncryptedDirName(dir)
+	if err != nil {
+		return stdpath.Join(d.RemotePath, "", "")
+	}
+	remoteFileName := ""
+	if len(strings.TrimSpace(fileName)) > 0 {
+		remoteFileName, err = d.getEncryptedName(fileName)
+		if err != nil {
+			return stdpath.Join(d.RemotePath, remoteDir, "")
+		}
+	}
+	return stdpath.Join(d.RemotePath, remoteDir, remoteFileName)
+}

	return decrypted + ext, err
	decrypted, err := d.cipher.DecryptFileName(base)
	return decrypted + ext, err

	// 如果不进行加密文件读取的大小应该不进行解密
	// If the file is not encrypted, the size should not be decrypted

	// 如果不进行加密文件读取的大小应该不进行解密
	// If files are not encrypted, the size should not be decrypted

	func (d *Crypt) getEncryptedName(filename string) (string, error) {
	// Encrypt file name (keep extension unchanged)
	func (d *Crypt) getEncryptedName(filename string) (string, error) {

Uh oh!

feat(drivers): add metadata-only encryption drive 'crypt2' #1114

Are you sure you want to change the base?

feat(drivers): add metadata-only encryption drive 'crypt2' #1114

Uh oh!

Conversation

zhlhlf commented Aug 20, 2025

Uh oh!

dezhishen commented Aug 20, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

zhlhlf commented Aug 20, 2025

Uh oh!

Uh oh!