Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(encrypt): support encrypt when sync #11

Merged
merged 49 commits into from
Dec 1, 2023
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
90896e5
feat: support encrypt in sync
GoldenSheep402 Nov 5, 2023
28814f2
chore: gen code
GoldenSheep402 Nov 5, 2023
91e50bf
feat: UpdateGroup with the arg of master_key
GoldenSheep402 Nov 6, 2023
5f69ad4
update: automatic generate new proto
GoldenSheep402 Nov 6, 2023
5d10fef
feat: Gen user's keychain
GoldenSheep402 Nov 6, 2023
cacb2dd
update: automatic generate new proto
GoldenSheep402 Nov 6, 2023
f8b1302
fix: Update
GoldenSheep402 Nov 6, 2023
a3136e6
Merge branch 'feat/encrypt' of github.com:juanjiTech/jTerm-proto into…
GoldenSheep402 Nov 6, 2023
b32263c
update: automatic generate new proto
GoldenSheep402 Nov 6, 2023
1dcb3a8
feat: GetUserKeyChain
GoldenSheep402 Nov 6, 2023
d0366ed
update: automatic generate new proto
GoldenSheep402 Nov 6, 2023
ff33f96
feat: UpdateUserKeyChain
GoldenSheep402 Nov 6, 2023
fe899b2
update: automatic generate new proto
GoldenSheep402 Nov 6, 2023
4713f8f
fix: proto of encrypt
GoldenSheep402 Nov 6, 2023
57cc65a
update: automatic generate new proto
GoldenSheep402 Nov 6, 2023
c04cebc
style: format
GoldenSheep402 Nov 6, 2023
6350878
Merge branch 'feat/encrypt' of github.com:juanjiTech/jTerm-proto into…
GoldenSheep402 Nov 6, 2023
d2970af
update: automatic generate new proto
GoldenSheep402 Nov 6, 2023
4cf43e2
fix: delete params
GoldenSheep402 Nov 6, 2023
35503ab
update: automatic generate new proto
GoldenSheep402 Nov 6, 2023
9d92aba
docs: comment
GoldenSheep402 Nov 6, 2023
3208547
update: automatic generate new proto
GoldenSheep402 Nov 6, 2023
0d55ede
fix: UpdateUserKeyChain
GoldenSheep402 Nov 6, 2023
e5d0a21
fix: GetUserKeyChain
GoldenSheep402 Nov 6, 2023
5415904
Merge branch 'feat/encrypt' of github.com:juanjiTech/jTerm-proto into…
GoldenSheep402 Nov 6, 2023
0114f3a
update: automatic generate new proto
GoldenSheep402 Nov 6, 2023
8e5794c
fix: UpdateGroup
GoldenSheep402 Nov 7, 2023
aa9165e
fix: proto order
GoldenSheep402 Nov 7, 2023
286d7e3
update: automatic generate new proto
GoldenSheep402 Nov 7, 2023
0ea045d
fix: UserKeyChain support incremental synchronization
GoldenSheep402 Nov 7, 2023
8706b1a
update: automatic generate new proto
GoldenSheep402 Nov 7, 2023
97be35d
fix: parms details
GoldenSheep402 Nov 7, 2023
22151d8
update: automatic generate new proto
GoldenSheep402 Nov 7, 2023
d39295b
fix: syncKeyChian with timestamp
GoldenSheep402 Nov 7, 2023
0ade793
update: automatic generate new proto
GoldenSheep402 Nov 7, 2023
ba93d18
fix: UpdateGroup with user's keychain
GoldenSheep402 Nov 8, 2023
cb67b18
fix: order of proto
GoldenSheep402 Nov 8, 2023
071bd6f
fix: name format of proto
GoldenSheep402 Nov 11, 2023
149bd95
fix: Separate key creation from group creation
GoldenSheep402 Nov 14, 2023
13c1708
chore: push gen file(workflow fail)
GoldenSheep402 Nov 14, 2023
84c2644
chore: Use camelCase naming instead
GoldenSheep402 Nov 15, 2023
8d9d0ad
fix: Invite process
GoldenSheep402 Nov 21, 2023
355bd3f
update: add team manage proto
asjdf Nov 22, 2023
857accf
feat: add invite process
asjdf Nov 22, 2023
c53358e
update: rename group to team
asjdf Nov 22, 2023
1357a32
update: remove email in user info
asjdf Nov 22, 2023
2a98726
update: reformat create team request
asjdf Nov 22, 2023
82a399c
update: move key wallet from sync to user
asjdf Nov 22, 2023
423e8fd
feat: improve invite service
asjdf Nov 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 99 additions & 2 deletions gen/openapi/sync/v1/sync_service.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,29 @@
"application/json"
],
"paths": {
"/gapi/sync/v1/get_user_key_chain": {
"get": {
"summary": "获取用户密钥对",
"operationId": "SyncService_GetUserKeyChain",
"responses": {
"200": {
"description": "A successful response.",
"schema": {
"$ref": "#/definitions/v1GetUserKeyChainResponse"
}
},
"default": {
"description": "An unexpected error response.",
"schema": {
"$ref": "#/definitions/rpcStatus"
}
}
},
"tags": [
"SyncService"
]
}
},
"/gapi/sync/v1/sync": {
"get": {
"summary": "拉取指定时间点之后的配置变动信息",
Expand Down Expand Up @@ -122,7 +145,7 @@
},
"/gapi/sync/v1/update_group": {
"post": {
"summary": "更新组信息",
"summary": "更新组信息 如果创建一个新的组",
"operationId": "SyncService_UpdateGroup",
"responses": {
"200": {
Expand Down Expand Up @@ -152,6 +175,39 @@
"SyncService"
]
}
},
"/gapi/sync/v1/update_user_key_chain": {
"post": {
"summary": "修改用户密钥对",
"operationId": "SyncService_UpdateUserKeyChain",
"responses": {
"200": {
"description": "A successful response.",
"schema": {
"$ref": "#/definitions/v1UpdateUserKeyChainResponse"
}
},
"default": {
"description": "An unexpected error response.",
"schema": {
"$ref": "#/definitions/rpcStatus"
}
}
},
"parameters": [
{
"name": "body",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/v1UpdateUserKeyChainRequest"
}
}
],
"tags": [
"SyncService"
]
}
}
},
"definitions": {
Expand Down Expand Up @@ -183,6 +239,17 @@
}
}
},
"v1GetUserKeyChainResponse": {
"type": "object",
"properties": {
"publicKey": {
"type": "string"
},
"encryptedPrivateKey": {
"type": "string"
}
}
},
"v1Group": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -227,6 +294,10 @@
"uid": {
"type": "string",
"title": "创建者"
},
"publicKey": {
"type": "string",
"title": "公钥 这里不存私钥,私钥加密后存在用户手上"
}
}
},
Expand Down Expand Up @@ -475,6 +546,13 @@
"groupId": {
"type": "string"
},
"publicKey": {
"type": "string"
},
"encryptedPrivateKey": {
"type": "string",
"title": "创建者的私钥"
},
"host": {
"$ref": "#/definitions/v1Host"
},
Expand All @@ -487,11 +565,16 @@
"identity": {
"$ref": "#/definitions/v1Identity"
}
}
},
"title": "如果是用于创建新的组,则提供master_key,用于加密rsa密钥"
},
"v1UpdateResponse": {
"type": "object",
"properties": {
"encryptedKey": {
"type": "string",
"title": "被master_key加密后的密钥,用于解密后续的密文,返回给本地以再次存储。"
},
"host": {
"$ref": "#/definitions/v1Host"
},
Expand All @@ -505,6 +588,20 @@
"$ref": "#/definitions/v1Identity"
}
}
},
"v1UpdateUserKeyChainRequest": {
"type": "object",
"properties": {
"publicKey": {
"type": "string"
},
"encryptedPrivateKey": {
"type": "string"
}
}
},
"v1UpdateUserKeyChainResponse": {
"type": "object"
}
}
}
25 changes: 17 additions & 8 deletions gen/proto/sync/v1/group.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions gen/proto/sync/v1/group.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ export type GroupBasic = {
description?: string
avatar?: string
uid?: string
publicKey?: string
}
Loading