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

add https connection and allowed hosts check #1575

Merged
merged 9 commits into from
Dec 19, 2023
82 changes: 82 additions & 0 deletions .github/workflows/codeql.yml
MattSilverio marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ "main", "issue-#1553" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main" ]
schedule:
- cron: '39 9 * * 3'

jobs:
analyze:
name: Analyze
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners
# Consider using larger runners for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript-typescript', 'python' ]
# CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
# Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{matrix.language}}"
38 changes: 32 additions & 6 deletions website/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
from django.db.models import Sum, Count, Q
from django.db.models.functions import ExtractMonth
from django.dispatch import receiver
from django.http import Http404,JsonResponse,HttpResponseRedirect,HttpResponse,HttpResponseNotFound
from django.http import Http404,JsonResponse,HttpResponseRedirect,HttpResponse,HttpResponseNotFound, HttpResponseBadRequest
from django.shortcuts import render, redirect, get_object_or_404
from django.template.loader import render_to_string
from django.utils.decorators import method_decorator
Expand Down Expand Up @@ -262,23 +262,49 @@ def newhome(request, template="new_home.html"):
}
return render(request, template, context)

def is_safe_url(url, allowed_hosts, allowed_paths=None):
if not is_valid_https_url(url):
return False

parsed_url = urlparse(url)

if parsed_url.netloc not in allowed_hosts:
return False

if allowed_paths and parsed_url.path not in allowed_paths:
return False

return True

def safe_redirect(url, allowed_hosts, allowed_paths=None):
if is_safe_url(url, allowed_hosts, allowed_paths):
safe_url = rebuild_safe_url(url)
return redirect(safe_url)
else:
return HttpResponseBadRequest('Invalid redirection URL.')

def github_callback(request):
ALLOWED_HOSTS = ['github.com']
params = urllib.parse.urlencode(request.GET)
url = f"{settings.CALLBACK_URL_FOR_GITHUB}?{params}"
parsed_url = urlparse(url)
if parsed_url.netloc in ALLOWED_HOSTS:
return redirect(url)

return safe_redirect(url, ALLOWED_HOSTS)


def google_callback(request):
ALLOWED_HOSTS = ['accounts.google.com']
params = urllib.parse.urlencode(request.GET)
return redirect(f"{settings.CALLBACK_URL_FOR_GOOGLE}?{params}")
url = f"{settings.CALLBACK_URL_FOR_GOOGLE}?{params}"

return safe_redirect(url, ALLOWED_HOSTS)


def facebook_callback(request):
ALLOWED_HOSTS = ['www.facebook.com']
params = urllib.parse.urlencode(request.GET)
return redirect(f"{settings.CALLBACK_URL_FOR_FACEBOOK}?{params}")
url = f"{settings.CALLBACK_URL_FOR_FACEBOOK}?{params}"

return safe_redirect(url, ALLOWED_HOSTS)


class FacebookLogin(SocialLoginView):
Expand Down
Loading