haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-07 18:30:27 +00:00
Code Issues Releases Wiki Activity

Adjust rpc name

Browse Source
This commit is contained in:
Heran Yang
2025-03-19 12:00:56 +08:00
parent 24b61c929c
commit 661d486dfe
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/rpc-service.c
View File

@@ -1163,12 +1163,12 @@ set_pwd_hash_to_commit (SeafCommit *commit,
}
int
seafile_upgrade_repo_enc_algorithm (const char *repo_id,
const char *user,
const char *passwd,
const char *pwd_hash_algo,
const char *pwd_hash_params,
GError **error)
seafile_upgrade_repo_pwd_hash_algorithm (const char *repo_id,
const char *user,
const char *passwd,
const char *pwd_hash_algo,
const char *pwd_hash_params,
GError **error)
{
SeafRepo *repo = NULL;
SeafCommit *commit = NULL, *parent = NULL;

12
include/seafile-rpc.h
View File

@@ -151,12 +151,12 @@ seafile_change_repo_passwd (const char *repo_id,
GError **error);
int
seafile_upgrade_repo_enc_algorithm (const char *repo_id,
const char *user,
const char *passwd,
const char *pwd_hash_algo,
const char *pwd_hash_params,
GError **error);
seafile_upgrade_repo_pwd_hash_algorithm (const char *repo_id,
const char *user,
const char *passwd,
const char *pwd_hash_algo,
const char *pwd_hash_params,
GError **error);
/**
* seafile_repo_size:

4
python/seafile/rpcclient.py
View File

@@ -642,9 +642,9 @@ class SeafServerThreadedRpcClient(NamedPipeClient):
# Upgrade repo enc algorithm
@searpc_func("int", ["string", "string", "string", "string", "string"])
def seafile_upgrade_repo_enc_algorithm (repo_id, user, passwd, pwd_hash_algo, pwd_hash_params):
def seafile_upgrade_repo_pwd_hash_algorithm (repo_id, user, passwd, pwd_hash_algo, pwd_hash_params):
pass
upgrade_repo_enc_algorithm = seafile_upgrade_repo_enc_algorithm
upgrade_repo_pwd_hash_algorithm = seafile_upgrade_repo_pwd_hash_algorithm
# Clean trash
@searpc_func("int", ["string", "int"])

6
python/seaserv/api.py
View File

@@ -73,9 +73,9 @@ class SeafileAPI(object):
return seafserv_threaded_rpc.change_repo_passwd(repo_id, old_passwd,
new_passwd, user)
def upgrade_repo_enc_algorithm (self, repo_id, user, passwd, pwd_hash_algo, pwd_hash_params):
return seafserv_threaded_rpc.upgrade_repo_enc_algorithm (repo_id, user, passwd,
pwd_hash_algo, pwd_hash_params)
def upgrade_repo_pwd_hash_algorithm (self, repo_id, user, passwd, pwd_hash_algo, pwd_hash_params):
return seafserv_threaded_rpc.upgrade_repo_pwd_hash_algorithm (repo_id, user, passwd,
pwd_hash_algo, pwd_hash_params)
def check_passwd(self, repo_id, magic):
return seafserv_threaded_rpc.check_passwd(repo_id, magic)

4
server/seaf-server.c
View File

@@ -121,8 +121,8 @@ static void start_rpc_service (const char *seafile_dir,
searpc_signature_int__string_string_string_string());
searpc_server_register_function ("seafserv-threaded-rpcserver",
seafile_upgrade_repo_enc_algorithm,
"seafile_upgrade_repo_enc_algorithm",
seafile_upgrade_repo_pwd_hash_algorithm,
"seafile_upgrade_repo_pwd_hash_algorithm",
searpc_signature_int__string_string_string_string_string());
searpc_server_register_function ("seafserv-threaded-rpcserver",

2
tests/test_password/test_password.py
View File

@@ -98,7 +98,7 @@ def test_upgrade_pwd_hash(enc_version, algo, params):
if enc_version > 2:
assert len(repo.salt) == 64
api.upgrade_repo_enc_algorithm (repo.repo_id, USER, test_repo_passwd, algo, params) == 0
api.upgrade_repo_pwd_hash_algorithm (repo.repo_id, USER, test_repo_passwd, algo, params) == 0
repo = api.get_repo(repo_id)
assert repo.pwd_hash_algo == algo;