##// END OF EJS Templates
auth-plugins: updated some code for better unicode compat.
marcink -
r3256:84d9886d default
parent child
Show More
@@ -222,7 +222,7 class RhodeCodeAuthPlugin(RhodeCodeExter
222
222
223 @hybrid_property
223 @hybrid_property
224 def name(self):
224 def name(self):
225 return "crowd"
225 return u"crowd"
226
226
227 def use_fake_password(self):
227 def use_fake_password(self):
228 return True
228 return True
@@ -102,7 +102,7 class RhodeCodeAuthPlugin(RhodeCodeExter
102
102
103 @hybrid_property
103 @hybrid_property
104 def name(self):
104 def name(self):
105 return 'headers'
105 return u"headers"
106
106
107 @property
107 @property
108 def is_headers_auth(self):
108 def is_headers_auth(self):
@@ -94,7 +94,7 class RhodeCodeAuthPlugin(RhodeCodeExter
94
94
95 @hybrid_property
95 @hybrid_property
96 def name(self):
96 def name(self):
97 return "jasig-cas"
97 return u"jasig-cas"
98
98
99 @property
99 @property
100 def is_headers_auth(self):
100 def is_headers_auth(self):
@@ -53,7 +53,7 class LdapError(Exception):
53 pass
53 pass
54
54
55
55
56 def plugin_factory(plugin_id, *args, **kwargs):
56 def plugin_factory(plugin_id, *args, **kwds):
57 """
57 """
58 Factory function that is called during plugin discovery.
58 Factory function that is called during plugin discovery.
59 It returns the plugin instance.
59 It returns the plugin instance.
@@ -350,6 +350,16 class LdapSettingsSchema(AuthnPluginSett
350 title=_('Login Attribute'),
350 title=_('Login Attribute'),
351 missing_msg=_('The LDAP Login attribute of the CN must be specified'),
351 missing_msg=_('The LDAP Login attribute of the CN must be specified'),
352 widget='string')
352 widget='string')
353 attr_email = colander.SchemaNode(
354 colander.String(),
355 default='',
356 description=_('LDAP Attribute to map to email address (e.g., mail).\n'
357 'Emails are a crucial part of RhodeCode. \n'
358 'If possible add a valid email attribute to ldap users.'),
359 missing='',
360 preparer=strip_whitespace,
361 title=_('Email Attribute'),
362 widget='string')
353 attr_firstname = colander.SchemaNode(
363 attr_firstname = colander.SchemaNode(
354 colander.String(),
364 colander.String(),
355 default='',
365 default='',
@@ -366,16 +376,6 class LdapSettingsSchema(AuthnPluginSett
366 preparer=strip_whitespace,
376 preparer=strip_whitespace,
367 title=_('Last Name Attribute'),
377 title=_('Last Name Attribute'),
368 widget='string')
378 widget='string')
369 attr_email = colander.SchemaNode(
370 colander.String(),
371 default='',
372 description=_('LDAP Attribute to map to email address (e.g., mail).\n'
373 'Emails are a crucial part of RhodeCode. \n'
374 'If possible add a valid email attribute to ldap users.'),
375 missing='',
376 preparer=strip_whitespace,
377 title=_('Email Attribute'),
378 widget='string')
379
379
380
380
381 class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
381 class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
@@ -414,7 +414,7 class RhodeCodeAuthPlugin(RhodeCodeExter
414
414
415 @hybrid_property
415 @hybrid_property
416 def name(self):
416 def name(self):
417 return "ldap"
417 return u"ldap"
418
418
419 def use_fake_password(self):
419 def use_fake_password(self):
420 return True
420 return True
@@ -104,7 +104,7 class RhodeCodeAuthPlugin(RhodeCodeExter
104
104
105 @hybrid_property
105 @hybrid_property
106 def name(self):
106 def name(self):
107 return "pam"
107 return u"pam"
108
108
109 def get_settings_schema(self):
109 def get_settings_schema(self):
110 return PamSettingsSchema()
110 return PamSettingsSchema()
@@ -73,7 +73,7 class RhodeCodeAuthPlugin(RhodeCodeAuthP
73
73
74 @hybrid_property
74 @hybrid_property
75 def name(self):
75 def name(self):
76 return "rhodecode"
76 return u"rhodecode"
77
77
78 def user_activation_state(self):
78 def user_activation_state(self):
79 def_user_perms = User.get_default_user().AuthUser().permissions['global']
79 def_user_perms = User.get_default_user().AuthUser().permissions['global']
@@ -76,7 +76,7 class RhodeCodeAuthPlugin(RhodeCodeAuthP
76
76
77 @hybrid_property
77 @hybrid_property
78 def name(self):
78 def name(self):
79 return "authtoken"
79 return u"authtoken"
80
80
81 def user_activation_state(self):
81 def user_activation_state(self):
82 def_user_perms = User.get_default_user().AuthUser().permissions['global']
82 def_user_perms = User.get_default_user().AuthUser().permissions['global']
General Comments 0
You need to be logged in to leave comments. Login now