Revision 1d59653f

b/snf-astakos-app/astakos/im/auth_providers.py
100 100

  
101 101
    def get_setting(self, name, default=None):
102 102
        attr = 'ASTAKOS_AUTH_PROVIDER_%s_%s' % (self.module.upper(), name.upper())
103
        attr_sec = 'ASTAKOS_%s_%s' % (self.module.upper(), name.upper())
104
        if not hasattr(settings, attr):
105
            return getattr(settings, attr_sec, default)
103 106
        return getattr(settings, attr, default)
104 107

  
105 108
    def is_available_for_login(self):
b/snf-astakos-app/astakos/im/settings.py
271 271

  
272 272
# Permit local account migration
273 273
ENABLE_LOCAL_ACCOUNT_MIGRATION = getattr(settings, 'ASTAKOS_ENABLE_LOCAL_ACCOUNT_MIGRATION', True)
274

  
275
# Strict shibboleth usage
276
SHIBBOLETH_REQUIRE_NAME_INFO = getattr(settings,
277
                                       'ASTAKOS_SHIBBOLETH_REQUIRE_NAME_INFO',
278
                                       False)
b/snf-astakos-app/astakos/im/target/shibboleth.py
95 95
        elif Tokens.SHIB_NAME in tokens and Tokens.SHIB_SURNAME in tokens:
96 96
            realname = tokens[Tokens.SHIB_NAME] + ' ' + tokens[Tokens.SHIB_SURNAME]
97 97
        else:
98
            realname = ''
98
            print settings.SHIBBOLETH_REQUIRE_NAME_INFO, "LALALALAL"
99
            if settings.SHIBBOLETH_REQUIRE_NAME_INFO:
100
                raise KeyError(_(astakos_messages.SHIBBOLETH_MISSING_NAME))
101
            else:
102
                realname = ''
99 103
    except KeyError, e:
100 104
        # invalid shibboleth headers, redirect to login, display message
101 105
        messages.error(request, e.message)

Also available in: Unified diff