haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-27 07:44:50 +00:00
Code Issues Releases Wiki Activity

Fix org repo settings, and org repo related code in api2

Browse Source
This commit is contained in:
zhengxie
2014-05-30 17:55:03 +08:00
parent 7dbd3a68c9
commit 583a1fa1d2
5 changed files with 233 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
seahub/api2/authentication.py
View File

@@ -2,9 +2,14 @@ import datetime
import logging import logging
from rest_framework.authentication import BaseAuthentication from rest_framework.authentication import BaseAuthentication
import seaserv
from seahub.base.accounts import User from seahub.base.accounts import User
from seahub.api2.models import Token, TokenV2 from seahub.api2.models import Token, TokenV2
from seahub.api2.utils import get_client_ip from seahub.api2.utils import get_client_ip
try:
from seahub.settings import MULTI_TENANCY
except ImportError:
MULTI_TENANCY = False
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -60,6 +65,11 @@ class TokenAuthentication(BaseAuthentication):
except User.DoesNotExist: except User.DoesNotExist:
return None return None
if MULTI_TENANCY:
orgs = seaserv.get_orgs_by_user(token.user)
if orgs:
user.org = orgs[0]
if user.is_active: if user.is_active:
return (user, token) return (user, token)
@@ -74,6 +84,11 @@ class TokenAuthentication(BaseAuthentication):
except User.DoesNotExist: except User.DoesNotExist:
return None return None
if MULTI_TENANCY:
orgs = seaserv.get_orgs_by_user(token.user)
if orgs:
user.org = orgs[0]
if user.is_active: if user.is_active:
need_save = False need_save = False
@@ -102,4 +117,5 @@ class TokenAuthentication(BaseAuthentication):
token.save() token.save()
except: except:
logger.exception('error when save token v2:') logger.exception('error when save token v2:')
return (user, token) return (user, token)

173
seahub/api2/views.py
View File

@@ -46,16 +46,20 @@ from seahub.options.models import UserOptions
from seahub.profile.models import Profile from seahub.profile.models import Profile
from seahub.shortcuts import get_first_object_or_none from seahub.shortcuts import get_first_object_or_none
from seahub.signals import repo_created, share_file_to_user_successful from seahub.signals import repo_created, share_file_to_user_successful
from seahub.share.models import PrivateFileDirShare, FileShare from seahub.share.models import PrivateFileDirShare, FileShare, OrgFileShare
from seahub.share.views import list_shared_repos
from seahub.utils import gen_file_get_url, gen_token, gen_file_upload_url, \ from seahub.utils import gen_file_get_url, gen_token, gen_file_upload_url, \
check_filename_with_rename, is_valid_username, EVENTS_ENABLED, \ check_filename_with_rename, is_valid_username, EVENTS_ENABLED, \
get_user_events, EMPTY_SHA1, get_ccnet_server_addr_port, \ get_user_events, EMPTY_SHA1, get_ccnet_server_addr_port, \
gen_block_get_url, get_file_type_and_ext, HAS_FILE_SEARCH, \ gen_block_get_url, get_file_type_and_ext, HAS_FILE_SEARCH, \
gen_file_share_link, gen_dir_share_link gen_file_share_link, gen_dir_share_link, is_org_context, gen_shared_link
from seahub.utils.star import star_file, unstar_file from seahub.utils.star import star_file, unstar_file
from seahub.utils.file_types import IMAGE, DOCUMENT from seahub.utils.file_types import IMAGE, DOCUMENT
from seahub.views import access_to_repo, validate_owner, is_registered_user, \ from seahub.views import access_to_repo, validate_owner, is_registered_user, \
group_events_data, get_diff, create_default_library group_events_data, get_diff, create_default_library, get_owned_repo_list, \
list_inner_pub_repos, get_virtual_repos_by_owner
from seahub.views.ajax import get_share_in_repo_list, get_groups_by_user, \
get_group_repos
from seahub.views.file import get_file_view_path_and_perm from seahub.views.file import get_file_view_path_and_perm
if HAS_FILE_SEARCH: if HAS_FILE_SEARCH:
from seahub_extra.search.views import search_keyword from seahub_extra.search.views import search_keyword
@@ -73,11 +77,11 @@ from pysearpc import SearpcError, SearpcObjEncoder
import seaserv import seaserv
from seaserv import seafserv_rpc, seafserv_threaded_rpc, server_repo_size, \ from seaserv import seafserv_rpc, seafserv_threaded_rpc, server_repo_size, \
get_personal_groups_by_user, get_session_info, is_personal_repo, \ get_personal_groups_by_user, get_session_info, is_personal_repo, \
get_group_repos, get_repo, check_permission, get_commits, is_passwd_set,\ get_repo, check_permission, get_commits, is_passwd_set,\
list_personal_repos_by_owner, check_quota, \ list_personal_repos_by_owner, check_quota, \
list_share_repos, get_group_repos_by_owner, get_group_repoids, \ list_share_repos, get_group_repos_by_owner, get_group_repoids, \
list_inner_pub_repos_by_owner, \ list_inner_pub_repos_by_owner, \
list_inner_pub_repos, remove_share, unshare_group_repo, \ remove_share, unshare_group_repo, \
unset_inner_pub_repo, get_user_quota, \ unset_inner_pub_repo, get_user_quota, \
get_user_share_usage, get_user_quota_usage, CALC_SHARE_USAGE, get_group, \ get_user_share_usage, get_user_quota_usage, CALC_SHARE_USAGE, get_group, \
get_commit, get_file_id_by_path, MAX_DOWNLOAD_DIR_SIZE, edit_repo, \ get_commit, get_file_id_by_path, MAX_DOWNLOAD_DIR_SIZE, edit_repo, \
@@ -384,7 +388,7 @@ class Repos(APIView):
email = request.user.username email = request.user.username
repos_json = [] repos_json = []
owned_repos = list_personal_repos_by_owner(email) owned_repos = get_owned_repo_list(request)
calculate_repo_info(owned_repos, email) calculate_repo_info(owned_repos, email)
owned_repos.sort(lambda x, y: cmp(y.latest_modify, x.latest_modify)) owned_repos.sort(lambda x, y: cmp(y.latest_modify, x.latest_modify))
sub_lib_enabled = settings.ENABLE_SUB_LIBRARY \ sub_lib_enabled = settings.ENABLE_SUB_LIBRARY \
@@ -412,7 +416,7 @@ class Repos(APIView):
repo["random_key"] = r.random_key repo["random_key"] = r.random_key
repos_json.append(repo) repos_json.append(repo)
shared_repos = seafile_api.get_share_in_repo_list(email, -1, -1) shared_repos = get_share_in_repo_list(request, -1, -1)
for r in shared_repos: for r in shared_repos:
commit = get_commits(r.repo_id, 0, 1)[0] commit = get_commits(r.repo_id, 0, 1)[0]
if not commit: if not commit:
@@ -421,7 +425,6 @@ class Repos(APIView):
r.root = commit.root_id r.root = commit.root_id
r.size = server_repo_size(r.repo_id) r.size = server_repo_size(r.repo_id)
r.password_need = is_passwd_set(r.repo_id, email) r.password_need = is_passwd_set(r.repo_id, email)
r.permission = check_permission(r.repo_id, email)
repo = { repo = {
"type":"srepo", "type":"srepo",
"id":r.repo_id, "id":r.repo_id,
@@ -432,7 +435,7 @@ class Repos(APIView):
"root":r.root, "root":r.root,
"size":r.size, "size":r.size,
"encrypted":r.encrypted, "encrypted":r.encrypted,
"permission": r.permission, "permission": r.user_perm,
} }
if r.encrypted: if r.encrypted:
repo["enc_version"] = r.enc_version repo["enc_version"] = r.enc_version
@@ -440,17 +443,16 @@ class Repos(APIView):
repo["random_key"] = r.random_key repo["random_key"] = r.random_key
repos_json.append(repo) repos_json.append(repo)
groups = get_personal_groups_by_user(email) groups = get_groups_by_user(request)
for group in groups: group_repos = get_group_repos(request, groups)
g_repos = get_group_repos(group.id, email) calculate_repo_info(group_repos, email)
calculate_repo_info(g_repos, email) group_repos.sort(lambda x, y: cmp(y.latest_modify, x.latest_modify))
g_repos.sort(lambda x, y: cmp(y.latest_modify, x.latest_modify)) for r in group_repos:
for r in g_repos:
repo = { repo = {
"type":"grepo", "type":"grepo",
"id":r.id, "id":r.id,
"owner":group.group_name, "owner":r.group.group_name,
"groupid":group.id, "groupid":r.group.id,
"name":r.name, "name":r.name,
"desc":r.desc, "desc":r.desc,
"mtime":r.latest_modify, "mtime":r.latest_modify,
@@ -465,8 +467,7 @@ class Repos(APIView):
repo["random_key"] = r.random_key repo["random_key"] = r.random_key
repos_json.append(repo) repos_json.append(repo)
if not CLOUD_MODE: public_repos = list_inner_pub_repos(request)
public_repos = list_inner_pub_repos(email)
for r in public_repos: for r in public_repos:
commit = get_commits(r.repo_id, 0, 1)[0] commit = get_commits(r.repo_id, 0, 1)[0]
if not commit: if not commit:
@@ -499,35 +500,38 @@ class Repos(APIView):
repo_desc = request.POST.get("desc", 'new repo') repo_desc = request.POST.get("desc", 'new repo')
passwd = request.POST.get("passwd") passwd = request.POST.get("passwd")
if not repo_name: if not repo_name:
return api_error(status.HTTP_400_BAD_REQUEST, \ return api_error(status.HTTP_400_BAD_REQUEST,
'Library name is required.') 'Library name is required.')
# create a repo # create a repo
org_id = -1
try: try:
if is_org_context(request):
org_id = request.user.org.org_id
repo_id = seafile_api.create_org_repo(repo_name, repo_desc,
username, passwd, org_id)
else:
repo_id = seafile_api.create_repo(repo_name, repo_desc, repo_id = seafile_api.create_repo(repo_name, repo_desc,
username, passwd) username, passwd)
except: except:
return api_error(HTTP_520_OPERATION_FAILED, \ return api_error(HTTP_520_OPERATION_FAILED,
'Failed to create library.') 'Failed to create library.')
if not repo_id: if not repo_id:
return api_error(HTTP_520_OPERATION_FAILED, \ return api_error(HTTP_520_OPERATION_FAILED,
'Failed to create library.') 'Failed to create library.')
else: else:
repo_created.send(sender=None, repo_created.send(sender=None,
org_id=-1, org_id=org_id,
creator=username, creator=username,
repo_id=repo_id, repo_id=repo_id,
repo_name=repo_name) repo_name=repo_name)
resp = repo_download_info(request, repo_id) resp = repo_download_info(request, repo_id)
# FIXME: according to the HTTP spec, need to return 201 code and # FIXME: according to the HTTP spec, need to return 201 code and
# with a corresponding location header # with a corresponding location header
# resp['Location'] = reverse('api2-repo', args=[repo_id]) # resp['Location'] = reverse('api2-repo', args=[repo_id])
return resp return resp
def set_repo_password(request, repo, password): def set_repo_password(request, repo, password):
assert password, 'password must not be none' assert password, 'password must not be none'
@@ -587,10 +591,11 @@ class Repo(APIView):
'You do not have permission to get repo.') 'You do not have permission to get repo.')
# check whether user is repo owner # check whether user is repo owner
if validate_owner(request, repo_id): if is_org_context(request):
owner = "self" repo_owner = seafile_api.get_org_repo_owner(repo.id)
else: else:
owner = "share" repo_owner = seafile_api.get_repo_owner(repo.id)
owner = "self" if username == repo_owner else "share"
last_commit = get_commits(repo.id, 0, 1)[0] last_commit = get_commits(repo.id, 0, 1)[0]
repo.latest_modify = last_commit.ctime if last_commit else None repo.latest_modify = last_commit.ctime if last_commit else None
@@ -649,8 +654,14 @@ class Repo(APIView):
repo_name = request.POST.get('repo_name') repo_name = request.POST.get('repo_name')
repo_desc = request.POST.get('repo_desc') repo_desc = request.POST.get('repo_desc')
if not seafile_api.is_repo_owner(username, repo_id): # check permission
return api_error(status.HTTP_403_FORBIDDEN, \ if is_org_context(request):
repo_owner = seafile_api.get_org_repo_owner(repo.id)
else:
repo_owner = seafile_api.get_repo_owner(repo.id)
is_owner = True if username == repo_owner else False
if not is_owner:
return api_error(status.HTTP_403_FORBIDDEN,
'Only library owner can perform this operation.') 'Only library owner can perform this operation.')
if edit_repo(repo_id, repo_name, repo_desc, username): if edit_repo(repo_id, repo_name, repo_desc, username):
@@ -668,8 +679,14 @@ class Repo(APIView):
return api_error(status.HTTP_400_BAD_REQUEST, \ return api_error(status.HTTP_400_BAD_REQUEST, \
'Library does not exist.') 'Library does not exist.')
if not seafile_api.is_repo_owner(username, repo_id): # check permission
return api_error(status.HTTP_403_FORBIDDEN, \ if is_org_context(request):
repo_owner = seafile_api.get_org_repo_owner(repo.id)
else:
repo_owner = seafile_api.get_repo_owner(repo.id)
is_owner = True if username == repo_owner else False
if not is_owner:
return api_error(status.HTTP_403_FORBIDDEN,
'Only library owner can perform this operation.') 'Only library owner can perform this operation.')
seafile_api.remove_repo(repo_id) seafile_api.remove_repo(repo_id)
@@ -688,7 +705,8 @@ class RepoHistory(APIView):
current_page = 1 current_page = 1
per_page = 25 per_page = 25
commits_all = get_commits(repo_id, per_page * (current_page -1), per_page + 1) commits_all = get_commits(repo_id, per_page * (current_page - 1),
per_page + 1)
commits = commits_all[:per_page] commits = commits_all[:per_page]
if len(commits_all) == per_page + 1: if len(commits_all) == per_page + 1:
@@ -696,7 +714,10 @@ class RepoHistory(APIView):
else: else:
page_next = False page_next = False
return HttpResponse(json.dumps({"commits": commits, "page_next": page_next}, cls=SearpcObjEncoder), status=200, content_type=json_content_type) return HttpResponse(json.dumps({"commits": commits,
"page_next": page_next},
cls=SearpcObjEncoder),
status=200, content_type=json_content_type)
class DownloadRepo(APIView): class DownloadRepo(APIView):
authentication_classes = (TokenAuthentication, ) authentication_classes = (TokenAuthentication, )
@@ -759,6 +780,9 @@ class RepoOwner(APIView):
if not repo: if not repo:
return api_error(status.HTTP_404_NOT_FOUND, 'Repo not found.') return api_error(status.HTTP_404_NOT_FOUND, 'Repo not found.')
if is_org_context(request):
repo_owner = seafile_api.get_org_repo_owner(repo.id)
else:
repo_owner = seafile_api.get_repo_owner(repo.id) repo_owner = seafile_api.get_repo_owner(repo.id)
return HttpResponse(json.dumps({"owner": repo_owner}), status=200, return HttpResponse(json.dumps({"owner": repo_owner}), status=200,
@@ -1496,6 +1520,7 @@ class FileSharedLinkView(APIView):
def put(self, request, repo_id, format=None): def put(self, request, repo_id, format=None):
# generate file shared link # generate file shared link
username = request.user.username
path = unquote(request.DATA.get('p', '').encode('utf-8')) path = unquote(request.DATA.get('p', '').encode('utf-8'))
type = unquote(request.DATA.get('type', 'f').encode('utf-8')) type = unquote(request.DATA.get('type', 'f').encode('utf-8'))
@@ -1507,33 +1532,31 @@ class FileSharedLinkView(APIView):
if path[-1] == '/': if path[-1] == '/':
path = path[:-1] path = path[:-1]
l = FileShare.objects.filter(repo_id=repo_id).filter(
username=request.user.username).filter(path=path) if type == 'f':
if len(l) > 0: fs = FileShare.objects.get_file_link_by_path(username, repo_id,
fileshare = l[0] path)
token = fileshare.token if fs is None:
type = fileshare.s_type fs = FileShare.objects.create_file_link(username, repo_id,
path)
if is_org_context(request):
org_id = request.user.org.org_id
OrgFileShare.objects.set_org_file_share(org_id, fs)
else: else:
token = gen_token(max_length=10) fs = FileShare.objects.get_dir_link_by_path(username, repo_id,
path)
if fs is None:
fs = FileShare.objects.create_dir_link(username, repo_id,
path)
if is_org_context(request):
org_id = request.user.org.org_id
OrgFileShare.objects.set_org_file_share(org_id, fs)
fs = FileShare() token = fs.token
fs.username = request.user.username shared_link = gen_shared_link(token, fs.s_type)
fs.repo_id = repo_id
fs.path = path
fs.token = token
fs.s_type = type
try:
fs.save()
except IntegrityError, e:
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, e.msg)
http_or_https = request.is_secure() and 'https' or 'http'
domain = RequestSite(request).domain
file_shared_link = '%s://%s%s%s/%s/' % (http_or_https, domain,
settings.SITE_ROOT, type, token)
resp = Response(status=status.HTTP_201_CREATED) resp = Response(status=status.HTTP_201_CREATED)
resp['Location'] = file_shared_link resp['Location'] = shared_link
return resp return resp
########## Directory related ########## Directory related
@@ -1690,7 +1713,7 @@ class DirDownloadView(APIView):
path += '/' path += '/'
if len(path) > 1: if len(path) > 1:
dirname = os.path.basename(path.rstrip('/')) # Here use `rstrip` to cut out last '/' in path dirname = os.path.basename(path.rstrip('/'))
else: else:
dirname = repo.name dirname = repo.name
@@ -1718,7 +1741,8 @@ class DirDownloadView(APIView):
return api_error(HTTP_520_OPERATION_FAILED, "Internal error") return api_error(HTTP_520_OPERATION_FAILED, "Internal error")
if total_size > MAX_DOWNLOAD_DIR_SIZE: if total_size > MAX_DOWNLOAD_DIR_SIZE:
return api_error(status.HTTP_400_BAD_REQUEST, 'Unable to download directory "%s": size is too large.' % dirname) return api_error(status.HTTP_400_BAD_REQUEST,
'Unable to download directory "%s": size is too large.' % dirname)
token = seafserv_rpc.web_get_access_token(repo_id, token = seafserv_rpc.web_get_access_token(repo_id,
dir_id, dir_id,
@@ -1726,7 +1750,8 @@ class DirDownloadView(APIView):
request.user.username) request.user.username)
redirect_url = gen_file_get_url(token, dirname) redirect_url = gen_file_get_url(token, dirname)
return HttpResponse(json.dumps(redirect_url), status=200, content_type=json_content_type) return HttpResponse(json.dumps(redirect_url), status=200,
content_type=json_content_type)
class DirShareView(APIView): class DirShareView(APIView):
authentication_classes = (TokenAuthentication, ) authentication_classes = (TokenAuthentication, )
@@ -1860,7 +1885,7 @@ class BeShared(APIView):
shared_repos.append(r) shared_repos.append(r)
if not CLOUD_MODE: if not CLOUD_MODE:
shared_repos += list_inner_pub_repos(username) shared_repos += seaserv.list_inner_pub_repos(username)
return HttpResponse(json.dumps(shared_repos, cls=SearpcObjEncoder), return HttpResponse(json.dumps(shared_repos, cls=SearpcObjEncoder),
status=200, content_type=json_content_type) status=200, content_type=json_content_type)
@@ -1869,7 +1894,8 @@ class PrivateFileDirShareEncoder(json.JSONEncoder):
def default(self, obj): def default(self, obj):
if not isinstance(obj, PrivateFileDirShare): if not isinstance(obj, PrivateFileDirShare):
return None return None
return {'from_user':obj.from_user, 'to_user':obj.to_user, 'repo_id':obj.repo_id, 'path':obj.path, 'token':obj.token, return {'from_user':obj.from_user, 'to_user':obj.to_user,
'repo_id':obj.repo_id, 'path':obj.path, 'token':obj.token,
'permission':obj.permission, 's_type':obj.s_type} 'permission':obj.permission, 's_type':obj.s_type}
class SharedFilesView(APIView): class SharedFilesView(APIView):
@@ -1922,14 +1948,15 @@ class VirtualRepos(APIView):
def get(self, request, format=None): def get(self, request, format=None):
result = {} result = {}
username = request.user.username
try: try:
result['virtual-repos'] = seafile_api.get_virtual_repos_by_owner(username) virtual_repos = get_virtual_repos_by_owner(request)
except SearpcError, e: except SearpcError, e:
result['error'] = e.msg return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR,
return HttpResponse(json.dumps(result), status=500, content_type=json_content_type) "error:" + e.msg)
return HttpResponse(json.dumps(result, cls=SearpcObjEncoder), content_type=json_content_type) result['virtual-repos'] = virtual_repos
return HttpResponse(json.dumps(result, cls=SearpcObjEncoder),
content_type=json_content_type)
class PrivateSharedFileView(APIView): class PrivateSharedFileView(APIView):
authentication_classes = (TokenAuthentication, ) authentication_classes = (TokenAuthentication, )
@@ -2126,8 +2153,10 @@ class FileShareEncoder(json.JSONEncoder):
def default(self, obj): def default(self, obj):
if not isinstance(obj, FileShare): if not isinstance(obj, FileShare):
return None return None
return {'username':obj.username, 'repo_id':obj.repo_id, 'path':obj.path, 'token':obj.token, return {'username':obj.username, 'repo_id':obj.repo_id,
'ctime':obj.ctime, 'view_cnt':obj.view_cnt, 's_type':obj.s_type} 'path':obj.path, 'token':obj.token,
'ctime':obj.ctime, 'view_cnt':obj.view_cnt,
's_type':obj.s_type}
class SharedLinksView(APIView): class SharedLinksView(APIView):
authentication_classes = (TokenAuthentication, ) authentication_classes = (TokenAuthentication, )
@@ -2199,10 +2228,10 @@ class DefaultRepoView(APIView):
username = request.user.username username = request.user.username
repo_id = UserOptions.objects.get_default_repo(username) repo_id = UserOptions.objects.get_default_repo(username)
if repo_id and (get_repo(repo_id) != None): if repo_id and (get_repo(repo_id) is not None):
return self.default_repo_info(repo_id) return self.default_repo_info(repo_id)
repo_id = create_default_library(username) repo_id = create_default_library(request)
return self.default_repo_info(repo_id) return self.default_repo_info(repo_id)

4
seahub/share/views.py
View File

@@ -720,11 +720,13 @@ def get_shared_link(request):
fs = FileShare.objects.get_file_link_by_path(username, repo_id, path) fs = FileShare.objects.get_file_link_by_path(username, repo_id, path)
if fs is None: if fs is None:
fs = FileShare.objects.create_file_link(username, repo_id, path) fs = FileShare.objects.create_file_link(username, repo_id, path)
if is_org_context(request):
org_id = request.user.org.org_id
OrgFileShare.objects.set_org_file_share(org_id, fs)
else: else:
fs = FileShare.objects.get_dir_link_by_path(username, repo_id, path) fs = FileShare.objects.get_dir_link_by_path(username, repo_id, path)
if fs is None: if fs is None:
fs = FileShare.objects.create_dir_link(username, repo_id, path) fs = FileShare.objects.create_dir_link(username, repo_id, path)
if is_org_context(request): if is_org_context(request):
org_id = request.user.org.org_id org_id = request.user.org.org_id
OrgFileShare.objects.set_org_file_share(org_id, fs) OrgFileShare.objects.set_org_file_share(org_id, fs)

66
seahub/views/__init__.py
View File

@@ -27,7 +27,7 @@ from django.views.decorators.http import condition
import seaserv import seaserv
from seaserv import get_repo, get_commits, is_valid_filename, \ from seaserv import get_repo, get_commits, is_valid_filename, \
seafserv_threaded_rpc, seafserv_rpc, is_repo_owner, check_permission, \ seafserv_threaded_rpc, seafserv_rpc, is_repo_owner, check_permission, \
list_inner_pub_repos, is_passwd_set, get_file_size, edit_repo, \ is_passwd_set, get_file_size, edit_repo, \
get_session_info, set_repo_history_limit, get_commit, \ get_session_info, set_repo_history_limit, get_commit, \
MAX_DOWNLOAD_DIR_SIZE, send_message, MAX_UPLOAD_FILE_SIZE MAX_DOWNLOAD_DIR_SIZE, send_message, MAX_UPLOAD_FILE_SIZE
from seaserv import seafile_api from seaserv import seafile_api
@@ -410,7 +410,11 @@ def repo_settings(request, repo_id):
raise Http404 raise Http404
# check permission # check permission
is_owner = True if seafile_api.is_repo_owner(username, repo_id) else False if is_org_context(request):
repo_owner = seafile_api.get_org_repo_owner(repo.id)
else:
repo_owner = seafile_api.get_repo_owner(repo.id)
is_owner = True if username == repo_owner else False
if not is_owner: if not is_owner:
raise Http404 raise Http404
@@ -447,9 +451,7 @@ def repo_settings(request, repo_id):
content_type=content_type) content_type=content_type)
### handle get request ### handle get request
repo_owner = seafile_api.get_repo_owner(repo.id)
history_limit = seaserv.get_repo_history_limit(repo.id) history_limit = seaserv.get_repo_history_limit(repo.id)
full_history_checked = no_history_checked = partial_history_checked = False full_history_checked = no_history_checked = partial_history_checked = False
if history_limit > 0: if history_limit > 0:
partial_history_checked = True partial_history_checked = True
@@ -488,6 +490,7 @@ def repo_owner(request, repo_id):
if request.method != 'POST': if request.method != 'POST':
raise Http404 raise Http404
content_type = 'application/json; charset=utf-8'
username = request.user.username username = request.user.username
repo = seafile_api.get_repo(repo_id) repo = seafile_api.get_repo(repo_id)
@@ -495,11 +498,15 @@ def repo_owner(request, repo_id):
raise Http404 raise Http404
# check permission # check permission
is_owner = True if seafile_api.is_repo_owner(username, repo_id) else False if is_org_context(request):
repo_owner = seafile_api.get_org_repo_owner(repo.id)
else:
repo_owner = seafile_api.get_repo_owner(repo.id)
is_owner = True if username == repo_owner else False
if not is_owner: if not is_owner:
raise Http404 raise Http404
content_type = 'application/json; charset=utf-8' # check POST arg
repo_owner = request.POST.get('repo_owner', '').lower() repo_owner = request.POST.get('repo_owner', '').lower()
if not is_valid_username(repo_owner): if not is_valid_username(repo_owner):
return HttpResponse(json.dumps({ return HttpResponse(json.dumps({
@@ -513,20 +520,34 @@ def repo_owner(request, repo_id):
'error': _('User %s is not found.') % repo_owner, 'error': _('User %s is not found.') % repo_owner,
}), status=400, content_type=content_type) }), status=400, content_type=content_type)
if is_org_context(request):
org_id = request.user.org.org_id
if not seaserv.ccnet_threaded_rpc.org_user_exists(org_id, repo_owner):
return HttpResponse(json.dumps({
'error': _('User %s is not in current organization.') %
repo_owner,}), status=400, content_type=content_type)
if repo_owner and repo_owner != username: if repo_owner and repo_owner != username:
if is_org_context(request):
org_id = request.user.org.org_id
seafile_api.set_org_repo_owner(org_id, repo_id, repo_owner)
else:
seafile_api.set_repo_owner(repo_id, repo_owner) seafile_api.set_repo_owner(repo_id, repo_owner)
messages.success(request, _(u'Library %(repo_name)s has been transfered to %(new_owner)s.') % {'repo_name':repo.name, 'new_owner':repo_owner}) messages.success(request,
_(u'Library %(repo_name)s has been transfered to %(new_owner)s.') %
{'repo_name': repo.name, 'new_owner': repo_owner})
return HttpResponse(json.dumps({'success': True}), return HttpResponse(json.dumps({'success': True}),
content_type=content_type) content_type=content_type)
@login_required @login_required
def repo_change_passwd(request, repo_id): def repo_change_passwd(request, repo_id):
"""Handle post request to change library password. """Handle ajax post request to change library password.
""" """
if request.method != 'POST': if request.method != 'POST':
raise Http404 raise Http404
content_type = 'application/json; charset=utf-8'
username = request.user.username username = request.user.username
repo = seafile_api.get_repo(repo_id) repo = seafile_api.get_repo(repo_id)
@@ -534,11 +555,16 @@ def repo_change_passwd(request, repo_id):
raise Http404 raise Http404
# check permission # check permission
is_owner = True if seafile_api.is_repo_owner(username, repo_id) else False if is_org_context(request):
repo_owner = seafile_api.get_org_repo_owner(repo.id)
else:
repo_owner = seafile_api.get_repo_owner(repo.id)
is_owner = True if username == repo_owner else False
if not is_owner: if not is_owner:
raise Http404 return HttpResponse(json.dumps({
'error': _('Faied to change password, you are not owner.')}),
status=400, content_type=content_type)
content_type = 'application/json; charset=utf-8'
old_passwd = request.POST.get('old_passwd', '') old_passwd = request.POST.get('old_passwd', '')
new_passwd = request.POST.get('new_passwd', '') new_passwd = request.POST.get('new_passwd', '')
try: try:
@@ -548,7 +574,8 @@ def repo_change_passwd(request, repo_id):
'error': e.msg, 'error': e.msg,
}), status=400, content_type=content_type) }), status=400, content_type=content_type)
messages.success(request, _(u'Successfully updated the password of Library %(repo_name)s.') % {'repo_name': repo.name}) messages.success(request, _(u'Successfully updated the password of Library %(repo_name)s.') %
{'repo_name': repo.name})
return HttpResponse(json.dumps({'success': True}), return HttpResponse(json.dumps({'success': True}),
content_type=content_type) content_type=content_type)
@@ -1505,6 +1532,19 @@ def demo(request):
redirect_to = settings.SITE_ROOT redirect_to = settings.SITE_ROOT
return HttpResponseRedirect(redirect_to) return HttpResponseRedirect(redirect_to)
def list_inner_pub_repos(request):
"""List inner pub repos.
"""
username = request.user.username
if is_org_context(request):
org_id = request.user.org.org_id
return seaserv.list_org_inner_pub_repos(org_id, username)
if not request.cloud_mode:
return seaserv.list_inner_pub_repos(username)
return []
@login_required @login_required
def pubrepo(request): def pubrepo(request):
""" """
@@ -1524,7 +1564,7 @@ def pubrepo(request):
}, context_instance=RequestContext(request)) }, context_instance=RequestContext(request))
if not request.cloud_mode: if not request.cloud_mode:
public_repos = list_inner_pub_repos(username) public_repos = seaserv.list_inner_pub_repos(username)
for r in public_repos: for r in public_repos:
if r.user == username: if r.user == username:
r.share_from_me = True r.share_from_me = True

5
seahub/views/ajax.py
View File

@@ -1239,9 +1239,8 @@ def upload_file_done(request):
return HttpResponse(json.dumps(result), status=400, content_type=ct) return HttpResponse(json.dumps(result), status=400, content_type=ct)
owner = seafile_api.get_repo_owner(repo_id) owner = seafile_api.get_repo_owner(repo_id)
if not owner: if not owner: # this is an org repo, get org repo owner
result['error'] = _('Wrong repo id') owner = seafile_api.get_org_repo_owner(repo_id)
return HttpResponse(json.dumps(result), status=400, content_type=ct)
file_path = path.rstrip('/') + '/' + filename file_path = path.rstrip('/') + '/' + filename
if seafile_api.get_file_id_by_path(repo_id, file_path) is None: if seafile_api.get_file_id_by_path(repo_id, file_path) is None: