Skip to content
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

detect merge conflicts #32

Open
wants to merge 32 commits into
base: ACHOO-16
Choose a base branch
from
Open

detect merge conflicts #32

wants to merge 32 commits into from

Conversation

tmthyjames
Copy link
Owner

No description provided.

tmthyjames and others added 30 commits January 8, 2018 15:57
Added a doc to help folks bootstrap a development environment.

Signed-off-by: Josh Farwell <[email protected]>
This was hard-coded, which is a lot better than an injection site, but I
want my zip code to show up :)

I'm using sqlalchemy.sql.text() to give us parameterized and
type-validated input even though we're not using a model here.

Returning None for invalid data bubbles up to a 400 error which seems
appropriate to me.

Signed-off-by: Josh Farwell <[email protected]>
Signed-off-by: Josh Farwell <[email protected]>
Instead of rendering the login template on 401s, we redirect to the
login page. The login page will now redirect to ?next after it has
validated the URL is safe. This fixes the issue with trying to log
in from pages that aren't /login.

Signed-off-by: Josh Farwell <[email protected]>
We want to avoid circular imports so we instantiate login_manager in
views and then initialize it in application.py.

Signed-off-by: Josh Farwell <[email protected]>
Turns out that Flask-Login implements the redirect chain by itself. It
doesn't validate the redirect URL though.

Signed-off-by: Josh Farwell <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants