New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[18.01] Fix exception if email is not specified or email is wrong #5663

Merged
merged 2 commits into from Mar 8, 2018

Conversation

Projects
None yet
2 participants
@mvdbeek
Member

mvdbeek commented Mar 8, 2018

We render a regular error a few lines lower.

The traceback is:

AttributeError: 'NoneType' object has no attribute 'split'
  File "galaxy/web/framework/middleware/sentry.py", line 43, in __call__
    iterable = self.application(environ, start_response)
  File "/cvmfs/main.galaxyproject.org/venv/lib/python2.7/site-packages/paste/recursive.py", line 85, in __call__
    return self.application(environ, start_response)
  File "galaxy/web/framework/middleware/statsd.py", line 35, in __call__
    req = self.application(environ, start_response)
  File "/cvmfs/main.galaxyproject.org/venv/lib/python2.7/site-packages/paste/httpexceptions.py", line 640, in __call__
    return self.application(environ, start_response)
  File "galaxy/web/framework/base.py", line 136, in __call__
    return self.handle_request(environ, start_response)
  File "galaxy/web/framework/base.py", line 215, in handle_request
    body = method(trans, **kwargs)
  File "galaxy/webapps/galaxy/controllers/user.py", line 928, in activate
    email = unquote(params.get('email', None))
  File "python2.7/urllib.py", line 1238, in unquote
    bits = s.split('%')
Fix exception if email is not specified
We render a regular error a few lines lower.

@mvdbeek mvdbeek added this to the 18.01 milestone Mar 8, 2018

@mvdbeek mvdbeek changed the title from [18.01] Fix exception if email is not specified to [18.01] Fix exception if email is not specified or email is wrong Mar 8, 2018

Avoid exception if email is wrong
Avoids:
```
AttributeError: 'NoneType' object has no attribute 'active'
  File "galaxy/web/framework/middleware/sentry.py", line 43, in __call__
    iterable = self.application(environ, start_response)
  File "/cvmfs/main.galaxyproject.org/venv/lib/python2.7/site-packages/paste/recursive.py", line 85, in __call__
    return self.application(environ, start_response)
  File "galaxy/web/framework/middleware/statsd.py", line 35, in __call__
    req = self.application(environ, start_response)
  File "/cvmfs/main.galaxyproject.org/venv/lib/python2.7/site-packages/paste/httpexceptions.py", line 640, in __call__
    return self.application(environ, start_response)
  File "galaxy/web/framework/base.py", line 136, in __call__
    return self.handle_request(environ, start_response)
  File "galaxy/web/framework/base.py", line 215, in handle_request
    body = method(trans, **kwargs)
  File "galaxy/webapps/galaxy/controllers/user.py", line 938, in activate
    if user.active is True:
```

@martenson martenson merged commit 0a95f20 into galaxyproject:release_18.01 Mar 8, 2018

4 of 6 checks passed

api test Test started.
Details
selenium test Test started.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 173 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 79 tests run, 4 skipped, 0 failed.
Details
toolshed test Build finished. 577 tests run, 0 skipped, 0 failed.
Details

@mvdbeek mvdbeek deleted the mvdbeek:user_activation_fix branch Jun 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment