 |
{item.folder_name} |
+ {item.repo_name} |
{item.share_type == 'personal' ?
{item.user_name} : item.group_name}
diff --git a/frontend/src/pages/sys-admin/admin-logs/operation-logs.js b/frontend/src/pages/sys-admin/admin-logs/operation-logs.js
index ff49bde5b7..2644db236b 100644
--- a/frontend/src/pages/sys-admin/admin-logs/operation-logs.js
+++ b/frontend/src/pages/sys-admin/admin-logs/operation-logs.js
@@ -138,15 +138,15 @@ class Item extends Component {
detailText = gettext('Created library {library_name} with {owner} as its owner')
.replace('{owner}', '' + detail.owner + '');
if (isPro && enableSysAdminViewRepo) {
- detailText = detailText.replace('{library_name}', '' + detail.name + '');
+ detailText = detailText.replace('{library_name}', '' + Utils.HTMLescape(detail.name) + '');
} else {
- detailText = detailText.replace('{library_name}', '' + detail.name + '');
+ detailText = detailText.replace('{library_name}', '' + Utils.HTMLescape(detail.name) + '');
}
return detailText;
case 'repo_delete':
detailText = gettext('Deleted library {library_name}')
- .replace('{library_name}', '' + detail.name + '');
+ .replace('{library_name}', '' + Utils.HTMLescape(detail.name) + '');
return detailText;
case 'repo_transfer':
@@ -154,9 +154,9 @@ class Item extends Component {
.replace('{user_from}', '' + detail.from + '')
.replace('{user_to}', '' + detail.to + '');
if (isPro && enableSysAdminViewRepo) {
- detailText = detailText.replace('{library_name}', '' + detail.name + '');
+ detailText = detailText.replace('{library_name}', '' + Utils.HTMLescape(detail.name) + '');
} else {
- detailText = detailText.replace('{library_name}', '' + detail.name + '');
+ detailText = detailText.replace('{library_name}', '' + Utils.HTMLescape(detail.name) + '');
}
return detailText;
diff --git a/seahub/api2/views.py b/seahub/api2/views.py
index cd95d16654..32f522911c 100644
--- a/seahub/api2/views.py
+++ b/seahub/api2/views.py
@@ -41,7 +41,7 @@ from seahub.wopi.utils import get_wopi_dict
from seahub.api2.base import APIView
from seahub.api2.models import TokenV2, DESKTOP_PLATFORMS
from seahub.api2.endpoints.group_owned_libraries import get_group_id_by_repo_owner
-from seahub.api2.utils import get_search_repos
+from seahub.api2.utils import get_search_repos, is_wiki_repo
from seahub.avatar.templatetags.avatar_tags import api_avatar_url, avatar
from seahub.avatar.templatetags.group_avatar_tags import api_grp_avatar_url, \
grp_avatar
@@ -858,6 +858,9 @@ class Repos(APIView):
if r.is_virtual:
continue
+ if is_wiki_repo(r):
+ continue
+
if q and q.lower() not in r.name.lower():
continue
@@ -914,6 +917,10 @@ class Repos(APIView):
shared_repos.sort(key=lambda x: x.last_modify, reverse=True)
for r in shared_repos:
+
+ if is_wiki_repo(r):
+ continue
+
if q and q.lower() not in r.name.lower():
continue
@@ -979,6 +986,10 @@ class Repos(APIView):
nickname_dict[e] = email2nickname(e)
for r in group_repos:
+
+ if is_wiki_repo(r):
+ continue
+
if q and q.lower() not in r.name.lower():
continue
@@ -1024,6 +1035,10 @@ class Repos(APIView):
nickname_dict[e] = email2nickname(e)
for r in public_repos:
+
+ if is_wiki_repo(r):
+ continue
+
if q and q.lower() not in r.name.lower():
continue
diff --git a/seahub/views/file.py b/seahub/views/file.py
index 7e1cafee09..202f153b1f 100644
--- a/seahub/views/file.py
+++ b/seahub/views/file.py
@@ -172,7 +172,10 @@ def get_office_feature_by_repo(repo):
repo_feature = _check_feature(repo.repo_id)
if not repo_feature and '@seafile_group' not in repo_owner:
- user = User.objects.get(email=repo_owner)
+ try:
+ user = User.objects.get(email=repo_owner)
+ except User.DoesNotExist:
+ return ENABLE_ONLYOFFICE, ENABLE_OFFICE_WEB_APP
role = get_user_role(user)
repo_feature = ROLES_DEFAULT_OFFCICE_SUITE.get(role)
diff --git a/thirdpart/shibboleth/backends.py b/thirdpart/shibboleth/backends.py
index da2c306cc4..2c3fbb03b7 100644
--- a/thirdpart/shibboleth/backends.py
+++ b/thirdpart/shibboleth/backends.py
@@ -12,6 +12,8 @@ from registration.models import (
logger = logging.getLogger(__name__)
SHIBBOLETH_PROVIDER_IDENTIFIER = getattr(settings, 'SHIBBOLETH_PROVIDER_IDENTIFIER', 'shibboleth')
+LDAP_PROVIDER = getattr(settings, 'LDAP_PROVIDER', 'ldap')
+SSO_LDAP_USE_SAME_UID = getattr(settings, 'SSO_LDAP_USE_SAME_UID', False)
class ShibbolethRemoteUserBackend(RemoteUserBackend):
@@ -52,6 +54,11 @@ class ShibbolethRemoteUserBackend(RemoteUserBackend):
remote_user = self.clean_username(remote_user)
shib_user = SocialAuthUser.objects.get_by_provider_and_uid(SHIBBOLETH_PROVIDER_IDENTIFIER, remote_user)
+ if not shib_user and SSO_LDAP_USE_SAME_UID:
+ shib_user = SocialAuthUser.objects.get_by_provider_and_uid(LDAP_PROVIDER, remote_user)
+ if shib_user:
+ SocialAuthUser.objects.add(shib_user.username, SHIBBOLETH_PROVIDER_IDENTIFIER, remote_user)
+
if shib_user:
try:
user = User.objects.get(email=shib_user.username)
|