Skip to content

S
slapos.core
Commit a9ed235d authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

slapos_*: Drop Facebook/Google support 

  Currently, it is not used on general code. Since it is not used
  we are dropping from our codebase. Nothing prevents other projects
  include it in future.
parent a1e6815c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 321 deletions
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudSecurityGroup.py
View file @ a9ed235d
......@@ -61,8 +61,7 @@ class TestSlapOSSecurityMixin(SlapOSTestCaseMixin):
for _, plugin in uf._getOb('plugins').listPlugins(
IAuthenticationPlugin ):
if plugin.authenticateCredentials(
{'login_portal_type': ('ERP5 Login', 'Certificate Login',
'Facebook Login', 'Google Login'),
{'login_portal_type': ('ERP5 Login', 'Certificate Login'),
'external_login': login}) is not None:
break
else:
......@@ -316,19 +315,6 @@ class TestSlapOSPersonSecurity(TestSlapOSSecurityMixin):
def test_inactive_erp5_login(self):
self.test_inactive(login_portal_type="ERP5 Login")
def test_active_facebook_login(self):
self.test_active(login_portal_type="Facebook Login")
def test_inactive_facebook_login(self):
self.test_inactive(login_portal_type="Facebook Login")
def test_active_google_login(self):
self.test_active(login_portal_type="Google Login")
def test_inactive_google_login(self):
self.test_inactive(login_portal_type="Google Login")
def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestSlapOSComputeNodeSecurity))
......
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Facebook%20Login.xml deleted 100644 → 0
View file @ a1e6815c
<type_roles>
<role id='Assignee'>
<property id='title'>The User Himself</property>
<property id='condition'>python: here.getParentValue().getPortalType() == "Person"</property>
<property id='base_category_script'>ERP5Type_getSecurityCategoryFromParent</property>
<multi_property id='categories'>local_role_group/user</multi_property>
<multi_property id='base_category'>group</multi_property>
</role>
</type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Google%20Login.xml deleted 100644 → 0
View file @ a1e6815c
<type_roles>
<role id='Assignee'>
<property id='title'>The User Himself</property>
<property id='condition'>python: here.getParentValue().getPortalType() == "Person"</property>
<property id='base_category_script'>ERP5Type_getSecurityCategoryFromParent</property>
<multi_property id='categories'>local_role_group/user</multi_property>
<multi_property id='base_category'>group</multi_property>
</role>
</type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Person.xml
View file @ a9ed235d
......@@ -26,7 +26,7 @@
<role id='Auditor'>
<property id='title'>The Shadow User Himself</property>
<property id='description'>Monovalued role</property>
<property id='condition'>python: here.objectValues(portal_type=["ERP5 Login", "Google Login", "Facebook Login", "Certificate Login"])</property>
<property id='condition'>python: here.objectValues(portal_type=here.getPortalLoginTypeList())</property>
<property id='base_category_script'>Person_getSecurityCategoryFromSelfShadow</property>
<multi_property id='categories'>local_role_group/shadow</multi_property>
<multi_property id='base_category'>group</multi_property>
......@@ -34,7 +34,7 @@
<role id='Assignee'>
<property id='title'>The User Himself</property>
<property id='description'>Monovalued role</property>
<property id='condition'>python: here.objectValues(portal_type=["ERP5 Login", "Google Login", "Facebook Login", "Certificate Login"])</property>
<property id='condition'>python: here.objectValues(portal_type=here.getPortalLoginTypeList())</property>
<property id='base_category_script'>ERP5Type_getSecurityCategoryFromSelf</property>
<multi_property id='categories'>local_role_group/user</multi_property>
<multi_property id='base_category'>group</multi_property>
......
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_base/ERP5Site_getAvailableOAuthLoginList.py deleted 100644 → 0
View file @ a1e6815c
oauth_login_list = []
portal_skin = context.getPortalObject().portal_skins
if getattr(portal_skin, "erp5_oauth_google_login", None) is not None:
connector = context.ERP5Site_getGoogleConnector()
if connector and connector[0].getClientId() is not None:
oauth_login_list.append("google")
if getattr(portal_skin, "erp5_oauth_facebook_login", None) is not None:
connector = context.ERP5Site_getFacebookConnector()
if connector and connector[0].getClientId() is not None:
oauth_login_list.append("facebook")
if getattr(portal_skin, "erp5_openid_connect_client", None) is not None:
oauth_login_list.append("openidconnect")
return oauth_login_list
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_base/ERP5Site_getAvailableOAuthLoginList.xml deleted 100644 → 0
View file @ a1e6815c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="_reconstructor" module="copy_reg"/>
</klass>
<tuple>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
<global name="object" module="__builtin__"/>
<none/>
</tuple>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ERP5Site_getAvailableOAuthLoginList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/TemplateTool_checkSlapOSPASConsistency.py
View file @ a9ed235d
......@@ -2,11 +2,8 @@ portal = context.getPortalObject()
slapos_plugin_dict = {
'IExtractionPlugin': [
'ERP5 Dumb HTTP Extraction Plugin',
'ERP5 Facebook Extraction Plugin',
'ERP5 External Authentication Plugin',
'ERP5 Access Token Extraction Plugin',
'ERP5 Google Extraction Plugin',
'ERP5 Facebook Extraction Plugin'
],
'IGroupsPlugin': [
'ZODB Group Manager',
......
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSAuthenticationPolicy.py
View file @ a9ed235d
......@@ -115,28 +115,6 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
document=self._makeDummySoftwareInstance(),
login_portal_type="Certificate Login")
def test_block_GoogleLogin_on_person(self):
person = self.makePerson(self.addProject(), user=0)
person.edit(
first_name="SOMENAME",
last_name="LASTNAME"
)
self._test_login_donot_block(
document=person,
login_portal_type="Google Login"
)
def test_block_FacebookLogin_on_person(self):
person = self.makePerson(self.addProject(), user=0)
person.edit(
first_name="SOMENAME",
last_name="LASTNAME"
)
self._test_login_donot_block(
document=person,
login_portal_type="Facebook Login"
)
def _test_expire(self, document, login_portal_type):
request = self.app.REQUEST
login = self._makeLogin(
......@@ -209,24 +187,3 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
document=self._makeDummySoftwareInstance(),
login_portal_type="Certificate Login")
def test_expire_GoogleLogin_on_person(self):
person = self.makePerson(self.addProject(), user=0)
person.edit(
first_name="SOMENAME",
last_name="LASTNAME"
)
self._test_dont_expire_when_password_isnt_set(
document=person,
login_portal_type="Google Login"
)
def test_expire_FacebookLogin_on_person(self):
person = self.makePerson(self.addProject(), user=0)
person.edit(
first_name="SOMENAME",
last_name="LASTNAME"
)
self._test_dont_expire_when_password_isnt_set(
document=person,
login_portal_type="Facebook Login"
)
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSCodingStyle.py
View file @ a9ed235d
......@@ -217,7 +217,6 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
'slapos_base/Login_isPasswordExpired',
'slapos_base/Login_notifyPasswordExpire',
'slapos_base/Person_applyContractInvitation',
'slapos_base/ERP5Site_getAvailableOAuthLoginList',
'slapos_erp5/CertificateAuthorityTool_checkCertificateAuthorityConsistency',
'slapos_erp5/CatalogTool_checkNoneCreationDateConsistency',
'slapos_panel_compatibility/Base_getComputerToken',
......@@ -292,7 +291,6 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
'slapos_parameter_editor/SoftwareProductModule_updateParameterEditorTestDialog',
'slapos_parameter_editor/SoftwareProductModule_validateParameterEditorTestDialog',
'slapos_parameter_editor/SoftwareProductModule_validateSoftwareReleaseForParameterEditorTestDialog',
'slapos_web_renderjs_ui/ERP5Site_callbackFacebookLogin',
'slapos_web_renderjs_ui/PasswordTool_changeUserPassword',
'slapos_web_renderjs_ui/WebSection_getDocumentValue',
'slapos_web_renderjs_ui/WebSection_getLoginWarningMessage',
......
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py
View file @ a9ed235d
......@@ -1825,27 +1825,6 @@ class TestERP5Login(TestSlapOSGroupRoleSecurityMixin):
self.assertRoles(delivery, self.user_id, ['Owner'])
self.assertRoles(delivery, delivery.getParentValue().getUserId(), ['Assignee'])
class TestFacebookLogin(TestSlapOSGroupRoleSecurityMixin):
def test_FacebookLogin_selfUser(self):
delivery = self.portal.person_module.newContent(
portal_type='Person').newContent(portal_type='Facebook Login')
self.assertSecurityGroup(delivery,
[delivery.getParentValue().getUserId(), self.user_id], False)
self.assertRoles(delivery, self.user_id, ['Owner'])
self.assertRoles(delivery, delivery.getParentValue().getUserId(), ['Assignee'])
class TestGoogleLogin(TestSlapOSGroupRoleSecurityMixin):
def test_GoogleLogin_selfUser(self):
delivery = self.portal.person_module.newContent(
portal_type='Person').newContent(portal_type='Google Login')
self.assertSecurityGroup(delivery,
[delivery.getParentValue().getUserId(), self.user_id], False)
self.assertRoles(delivery, self.user_id, ['Owner'])
self.assertRoles(delivery, delivery.getParentValue().getUserId(), ['Assignee'])
class TestCertificateLogin(TestSlapOSGroupRoleSecurityMixin):
def test_CertificateLogin_person(self):
delivery = self.portal.person_module.newContent(
......
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
View file @ a9ed235d
......@@ -60,7 +60,6 @@ erp5_administration
erp5_authentication_policy
erp5_auto_logout
erp5_base
erp5_bearer_token
erp5_big_file
erp5_ckeditor
erp5_code_mirror
......@@ -92,9 +91,6 @@ erp5_json_editor
erp5_json_type
erp5_monaco_editor
erp5_notebook
erp5_oauth
erp5_oauth_facebook_login
erp5_oauth_google_login
erp5_ods_core
erp5_odt_core
erp5_ooo_import
......
master/bt5/slapos_erp5/bt/template_portal_type_role_list
View file @ a9ed235d
......@@ -33,9 +33,7 @@ Document Ingestion Module
Document Module
ERP5 Login
Event Module
Facebook Login
Fax Message
Google Login
Hosting Subscription
Hosting Subscription Module
Incident Response
......
master/bt5/slapos_jio/bt/dependency_list
View file @ a9ed235d
......@@ -3,8 +3,6 @@ erp5_access_token
erp5_commerce
erp5_credential_oauth2
erp5_access_token
erp5_oauth_google_login
erp5_oauth_facebook_login
slapos_payzen
slapos_wechat
slapos_crm
......
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_web_renderjs_ui/ERP5Site_callbackFacebookLogin.py deleted 100644 → 0
View file @ a1e6815c
import time
def handleError(error):
context.REQUEST.RESPONSE.setStatus(401)
if error is not None:
return handleError(error)
elif code is not None:
portal = context.getPortalObject()
response_dict = context.ERP5Site_getFacebookAccessTokenFromCode(
code,
"{0}/ERP5Site_callbackFacebookLogin".format(context.absolute_url()))
if response_dict is not None:
access_token = response_dict['access_token'].encode('utf-8')
hash_str = context.Base_getHMAC(access_token, access_token)
response = context.REQUEST.RESPONSE
context.setAuthCookie(response, '__ac_facebook_hash', hash_str)
# store timestamp in second since the epoch in UTC is enough
response_dict["response_timestamp"] = time.time()
context.Base_setBearerToken(hash_str,
response_dict,
"facebook_server_auth_token_cache_factory")
user_dict = context.ERP5Site_getFacebookUserEntry(access_token)
user_reference = user_dict["reference"]
context.Base_setBearerToken(access_token,
{"reference": user_reference},
"facebook_server_auth_token_cache_factory")
method = getattr(context, "ERP5Site_createFacebookUserToOAuth", None)
if method is not None:
method(user_reference, user_dict)
person_relative_url = context.ERP5Site_getPersonFromFacebookLogin(user_reference)
came_from = portal.absolute_url() + "/#!login?n.me=%s" % (person_relative_url)
response.setHeader('Location', came_from)
response.setStatus(303)
else:
return handleError('')
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_web_renderjs_ui/ERP5Site_callbackFacebookLogin.xml deleted 100644 → 0
View file @ a1e6815c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="_reconstructor" module="copy_reg"/>
</klass>
<tuple>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
<global name="object" module="__builtin__"/>
<none/>
</tuple>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>code=None, error=None</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Auditor</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ERP5Site_callbackFacebookLogin</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_panel/bt/dependency_list
View file @ a9ed235d
......@@ -4,8 +4,6 @@ erp5_access_token
erp5_commerce
erp5_credential_oauth2
erp5_access_token
erp5_oauth_google_login
erp5_oauth_facebook_login
slapos_payzen
slapos_wechat
slapos_crm
......
master/product/SlapOS/tests/testSlapOSMixin.py
View file @ a9ed235d
......@@ -274,13 +274,9 @@ class testSlapOSMixin(ERP5TypeTestCase):
'erp5_web_service',
'erp5_graph_editor',
'slapos_l10n_zh',
'erp5_bearer_token',
'erp5_certificate_authority',
'erp5_access_token',
'erp5_project',
'erp5_oauth',
'erp5_oauth_facebook_login',
'erp5_oauth_google_login',
'erp5_run_my_doc',
'erp5_slapos_tutorial',
'erp5_slapos_tutorial_data',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7