1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-31 22:57:47 +00:00
Commit Graph

31 Commits

Author SHA1 Message Date
lian
92445b16ef
shib second uid (#6175)
* second uid for shibboleth

* update test
2024-06-12 17:24:24 +08:00
WJH
f7495902db
improve shibboleth login (#5534)
* improve shibboleth login

* fix test
2023-07-07 17:33:40 +08:00
lian
f365f2b342 django 4.2 2023-06-12 09:53:31 +08:00
王健辉
0cf73131f5
fix shibboleth update_user_quota (#5242) 2022-08-15 11:37:15 +08:00
王健辉
05a55b38c4 fix django2 syntax 2021-04-21 23:38:53 +08:00
lian
33a9849555 Merge branch '7.1' into master 2020-10-19 10:43:45 +08:00
lian
62c2f0bc9e
update for dev env (#4690)
Co-authored-by: lian <lian@seafile.com>
2020-10-10 16:05:33 +08:00
lian
57c8fa967c
custom shibboleth get user role (#4689)
Co-authored-by: lian <lian@seafile.com>
2020-10-10 15:40:57 +08:00
lian
141121f5af Merge branch '7.1' into master 2020-09-10 16:37:31 +08:00
lian
949bdce5c1
encode("iso-8859-1") for shibboleth login (#4667)
Co-authored-by: lian <lian@seafile.com>
2020-09-09 10:36:27 +08:00
王健辉
21756be27c
upgrade django to 2.2 (#4620) 2020-07-27 14:59:18 +08:00
sniper-py
99a9ece04e Python3 master (#4076)
* delete thridpart/social_django

* delete social_django in seahub/urls.py

* delete social_django in seahub/settings.py

* delete seahub/notifications/management/commands/send_wxwork_notices.py

* delete social_django in code annotation

* delete seahub/social_core

* delete tests/seahub/social_core

* delete social_core in seahub/urls.py

* delete social_core in seahub/settings.py

* change app_label to auth in SocialAuthUser model

* 2to3 asserts

* 2to3 basestring

* 2to3 dict

* 2to3 except

* 2to3 filter

* 2to3 future

* 2to3 has_key

* 2to3 idioms

* 2to3 import

* 2to3 imports

* 2to3 long

* 2to3 map

* 2to3 next

* 2to3 numliterals

* 2to3 print

* 2to3 raise

* 2to3 raw_input

* 2to3 reduce

* 2to3 reload

* 2to3 set_literal

* 2to3 unicode

* 2to3 urllib

* 2to3 ws_comma

* 2to3 xrange

* 2to3 zip

* add pymysql in __init__.py

* fix encode and decode in seahub/cconvert.py

* fix seafserv_rpc.is_passwd_set in seahub/views/__init__.py

* fix smart_unicode to smart_text

* fix force_unicode to force_text

* delete seaserv.get_session_info

* delete seaserv.ccnet_rpc

* fix indent error in seahub/auth/middleware.py

* update dev-requirements

* update test-requirements

* update requirements

* fix StringIO to BytesIO in thumbnail

* fix seaserv.list_inner_pub_repos to seafile_api.get_inner_pub_repo_list

* fix seaserv.list_org_inner_pub_repos to seafile_api.list_org_inner_pub_repos

* add logger in seahub/utils/__init__.py

* fix sort cmp in seahub/views/__init__.py

* fix sort cmp in seahub/base/management/commands/export_file_access_log.py

* fix sort cmp in seahub/api2/endpoints/repo_trash.py

* fix sort cmp in seahub/api2/endpoints/shared_repos.py

* fix sort cmp in seahub/api2/endpoints/shared_folders.py

* fix sort cmp in seahub/wiki/views.py

* fix sort cmp in seahub/api2/endpoints/wiki_pages.py

* fix sort cmp in seahub/api2/endpoints/group_libraries.py

* fix sort cmp in seahub/base/models.py

* fix sort cmp in seahub/api2/endpoints/upload_links.py

* fix sort cmp in seahub/views/ajax.py

* fix sort cmp in seahub/api2/views.py

* fix sort cmp in seahub/views/wiki.py

* fix sort cmp in seahub/api2/endpoints/repos.py

* fix sort cmp in seahub/api2/endpoints/starred_items.py

* fix sort cmp in seahub/views/file.py

* fix sort cmp in seahub/api2/endpoints/dir.py

* fix sort cmp in seahub/api2/endpoints/share_links.py

* fix cmp to cmp_to_key in seahub/api2/endpoints/admin/device_trusted_ip.py

* fix cmp to cmp_to_key in tests/api/endpoints/admin/test_device_trusted_ip.py

* delete encode('utf-8') in seafile_api.list_dir_by_commit_and_path

* delete encode('utf-8') in is_file_starred

* delete encode('utf-8') in seafile_api.list_dir_by_path

* delete path.encode('utf-8') in seahub/views/file.py

* fix os.write to add encode('utf-8')

* add encode('utf-8') for hashlib

* add encode('utf-8') for hmac

* fix with open(file, 'wb') for binary file

* fix encode and decode in seahub/utils/hasher.py

* fix next in thirdpart/shibboleth/views.py

* fix next in seahub/profile/views.py

* fix next in seahub/notifications/views.py

* fix next in seahub/institutions/views.py

* fix next in seahub/options/views.py

* fix next in seahub/share/views.py

* fix next in seahub/avatar/views.py

* fix next in seahub/views/__init__.py

* fix next in seahub/group/views.py

* fix next in seahub/views/wiki.py

* fix next in seahub/views/sysadmin.py

* fix next in seahub/views/file.py

* fix string.lowercase to string.ascii_lowercase in test

* fix open file add 'rb' in test

* fix self.user.username in test

* add migrations in file_participants

* fix list_org_inner_pub_repos to list_org_inner_pub_repos_by_owner

* fix from seaserv import is_passwd_set to seafile_api.is_password_set

* fix assert bytes resp.content in test

* fix seafile_api.get_inner_pub_repo_list to seafile_api.list_inner_pub_repos_by_owner

* fix seafile_api.is_passwd_set to seafile_api.is_password_set

* fix AccountsApiTest assert length

* rewrite sort_devices cmp to operator.lt

* fix bytes + str in seahub/api2/views.py

* fix assert bytes resp.content in test

* fix hashlib encode in seahub/thirdpart/registration/models.py

* change app_label to base in SocialAuthUser

* fix base64 encode in seahub/base/database_storage/database_storage.py

* fix assert bytes resp.content

* remove path.decode in def mkstemp()

* remove path.decode in FpathToLinkTest

* remove str decode in FileTagTest

* remove mock_write_xls.assert_called_once() in SysUserAdminExportExcelTest

* fix urllib assert in FilesApiTest

* fix link fields in FileCommentsTest

* fix get_related_users_by_repo()

* fix assert list in GetRepoSharedUsersTest

* fix create user in AccountTest

* fix repeated key in dict seahub/api2/views.py

* add drone.yml

* update nginx conf in test

* update test conf in test

* update dist and push after test success

* update drone conf to dist and push

* fix assert in BeSharedReposTest

* fix seafile_api.list_org_inner_pub_repos_by_owner(org_id, username) to seafile_api.list_org_inner_pub_repos(org_id)

* fix seafile_api.list_inner_pub_repos_by_owner(username) to seafile_api.get_inner_pub_repo_list()

* update pyjwt requirement

* update dist branch in drone

* add SKIP in dist and push

* fix StringIO to BytesIO in seahub/avatar/models.py

* fix if org_id > 0 to if org_id and org_id > 0

* remove payment

* fix StringIO to BytesIO in seahub/base/database_storage/database_storage.py

* fix send_message to seafile_api.publish_event in seahub/drafts/utils.py

* fix send_message to seafile_api.publish_event in seahub/api2/views.py

* fix send_message to seafile_api.publish_event in seahub/api2/endpoints/repos.py

* fix send_message to seafile_api.publish_event in seahub/views/file.py

* fix send_message to seafile_api.publish_event in seahub/utils/__init__.py

* fix image_file.read encode in seahub/base/database_storage/database_storage.py

* fix DatabaseStorageTest

* remove .travis.yml

* drone branch include master
2019-09-11 11:46:43 +08:00
zhengxie
a45e6b5cdd [shibboleth] Only apply middleware to certain url 2018-09-15 16:13:07 +08:00
zhengxie
318c7de424 [auth, api, shibboleth] Use primary id in login 2017-08-26 14:54:48 +08:00
zhengxie
9a5aae50ab [shibboleth] Add joker * in affiliation role map 2017-08-02 18:31:15 +08:00
zhengxie
e30d19c791 [shibboleth] Fix empty role quota issue which will cause page unavailable 2017-06-26 10:33:54 +08:00
zhengxie
2c2a84159d [role_permission] Add quota for a certain role 2017-06-05 17:52:04 +08:00
zhengxie
1832b2b0c0 [shib] Add affiliation role map 2017-01-17 13:24:08 +08:00
zhengxie
f12215ec5e
[shib] Fix shib complete url bug 2016-05-17 17:48:57 +08:00
zhengxie
f43cdb3f35 [tests] Make shib test pass 2016-03-24 16:58:55 +08:00
zhengxie
65a336f573 [shib] Add shibboleth complete page 2016-03-24 16:25:45 +08:00
zhengxie
11e645cae0 [shib] Use display_name in shib_meta as nickname, fallback to givenname + surname if missing 2016-02-23 14:26:10 +08:00
zhengxie
508322e629 [shibboleth] Record nickname, contact email and institution to profile 2016-01-27 14:10:51 +08:00
Shuai Lin
120d094b1b sudo mode: handle shibboleth login 2015-05-05 13:42:03 +08:00
Shuai Lin
d0ca22283a small fix of shibboleth middware 2015-04-07 10:25:31 +08:00
Shuai Lin
2b1e11d129 use token v2 for shibboleth login 2015-04-02 20:48:16 +08:00
Shuai Lin
22a1d52aca fixed shibboleth middleware set cookie problem 2015-04-02 20:45:32 +08:00
David Kreitschmann
0fddddf8d1 Environment variable for shibboleth user name can be changed. The default is REMOTE_USER which is provided by e.g. apache modules. 2015-03-05 00:09:06 +01:00
zhengxie
92d0c09507 [shib] set username and api token in cookie when the user login with Shibboleth the first time 2014-12-25 18:29:13 +08:00
zhengxie
61b41e8fea [shibboleth] Modify user creation 2014-12-25 18:29:13 +08:00
zhengxie
c914fe30c5 [thirdpart] Add shibboleth 2014-12-25 18:29:13 +08:00