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.

Sign up for GitHub

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

ASV-326 Vulnerable askrover Dependency : pyjwt (< 2.4.0) #182

Closed
wants to merge 11 commits into from
Closed

ASV-326 Vulnerable askrover Dependency : pyjwt (< 2.4.0) #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ba1f520
Freeze Coffin version to <2.0
delinhabit Apr 17, 2015
101132f
Merge pull request #79 from roverdotcom/freeze-coffin
delinhabit Apr 17, 2015
c6dbec4
Did the same thing in the `_dev` requirements file
delinhabit Apr 17, 2015
431307a
Merge pull request #80 from roverdotcom/freeze-coffin
delinhabit Apr 17, 2015
49a364b
Revert "Freeze Coffin version to <2.0"
delinhabit Apr 17, 2015
0e17008
Merge pull request #81 from roverdotcom/revert-79-freeze-coffin
delinhabit Apr 17, 2015
33e848a
Revert "Did the same thing in the `_dev` requirements file"
delinhabit Apr 17, 2015
67b61e6
Merge pull request #82 from roverdotcom/revert-80-freeze-coffin
delinhabit Apr 17, 2015
fb7c377
dont flush session before posting anonymous, and ensure session key e…
alexanderross Sep 26, 2019
58e9b48
Merge pull request #169 from roverdotcom/DEV-38741-2
alexanderross Sep 27, 2019
d7208c5
Remove intranet related stuff and USE_LOCAL_FONTS
juliezhangr Nov 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions askbot/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ def application_settings(request):
'ASKBOT_CSS_DEVEL',
False
)
my_settings['USE_LOCAL_FONTS'] = getattr(
settings,
'ASKBOT_USE_LOCAL_FONTS',
False
)
my_settings['CSRF_COOKIE_NAME'] = settings.CSRF_COOKIE_NAME
my_settings['DEBUG'] = settings.DEBUG
my_settings['USING_RUNSERVER'] = 'runserver' in sys.argv
Expand All @@ -64,15 +59,15 @@ def application_settings(request):
my_settings['LOGOUT_REDIRECT_URL'] = url_utils.get_logout_redirect_url()
my_settings['USE_ASKBOT_LOGIN_SYSTEM'] = 'askbot.deps.django_authopenid' \
in settings.INSTALLED_APPS

current_language = get_language()

#for some languages we will start searching for shorter words
if current_language == 'ja':
#we need to open the search box and show info message about
#the japanese lang search
min_search_word_length = 1
else:
else:
min_search_word_length = my_settings['MIN_SEARCH_WORD_LENGTH']

context = {
Expand Down
18 changes: 3 additions & 15 deletions askbot/templates/meta/fonts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
{% if settings.USE_LOCAL_FONTS %}
{# this version is for serving fonts locally - e.g. for intranet sites #}
<style type="text/css">
@font-face {
font-family: 'Open Sans Condensed';
font-style: normal;
font-weight: 700;
src: url('{{"/images/OpenSans-CondBold.ttf"|media}}');
}
</style>
{% else %}
{# note: for IE8 we ask for fonts separately #}
<link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&amp;subset=latin-ext' rel='stylesheet' type='text/css' />
<link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&amp;subset=cyrillic-ext' rel='stylesheet' type='text/css' />
{% endif %}
{# note: for IE8 we ask for fonts separately #}
<link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&amp;subset=latin-ext' rel='stylesheet' type='text/css' />
<link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&amp;subset=cyrillic-ext' rel='stylesheet' type='text/css' />
7 changes: 5 additions & 2 deletions askbot/views/writers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,11 @@ def ask(request):#view used to ask a new question
return HttpResponseRedirect(reverse('index'))

else:
request.session.flush()
session_key=request.session.session_key

if not session_key:
session_key = request.session.create()

models.AnonymousQuestion.objects.create(
session_key=session_key,
title=title,
Expand All @@ -285,7 +288,7 @@ def ask(request):#view used to ask a new question
added_at=timestamp,
ip_addr=request.META.get('REMOTE_ADDR'),
)
return HttpResponseRedirect(url_utils.get_login_url())
return HttpResponseRedirect(settings.ROVER_LOGIN_URL)

if request.method == 'GET':
form = forms.AskForm(user=request.user)
Expand Down
Loading