Skip to content

Commit a4b7fa8

Browse files
ArchmongerArchmonger
committed
Remove X_FRAME_OPTIONS
1 parent 903526d commit a4b7fa8

2 files changed

Lines changed: 14 additions & 22 deletions

File tree

‎README.md‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Conreq Beta
22

3-
[![Docker Pulls](https://img.shields.io/docker/pulls/roxedus/conreq?style=flat-square)](https://hub.docker.com/r/roxedus/conreq)
4-
[![Docker Stars](https://img.shields.io/docker/stars/roxedus/conreq?style=flat-square)](https://hub.docker.com/r/roxedus/conreq)
5-
[![Docker Hub](https://img.shields.io/badge/Open%20On-DockerHub-blue?style=flat-square)](https://hub.docker.com/r/roxedus/conreq)
6-
[![Discord](https://img.shields.io/discord/440067432552595457?style=flat-square&label=Discord&logo=discord)](https://discord.gg/gQhGZzEjmX "Chat with the community and get realtime support!")
3+
[![Docker Pulls](https://img.shields.io/docker/pulls/roxedus/conreq?style=flat-square)](https://hub.docker.com/r/roxedus/conreq) [![Docker Stars](https://img.shields.io/docker/stars/roxedus/conreq?style=flat-square)](https://hub.docker.com/r/roxedus/conreq) [![Docker Hub](https://img.shields.io/badge/Open%20On-DockerHub-blue?style=flat-square)](https://hub.docker.com/r/roxedus/conreq) [![Discord](https://img.shields.io/discord/440067432552595457?style=flat-square&label=Discord&logo=discord)](https://discord.gg/gQhGZzEjmX "Chat with the community and get realtime support!")
74

85
Conreq, a content requesting platform.
96

@@ -35,7 +32,6 @@ MYSQL_CONFIG_FILE = /config/mysql.cnf # default: None
3532
# Security
3633
SSL_SECURITY = True # default: False (True enables advanced SSL security features)
3734
PWNED_VALIDATOR = False # default: True (False disables checking for compromised passwords)
38-
X_FRAME_OPTIONS = SAMEORIGIN # default: DENY (False disables X-Frame-Options)
3935
ALLOWED_HOST = 192.168.0.199 # default: * (Comma separated list. Asterisk allows all hosts.)
4036
TRUSTED_ORIGINS = https://*.example.com # default: None (Comma separated list. Required to be set if using https.)
4137
DEBUG = True # default: False (Only enable this during development or testing.)
@@ -51,25 +47,25 @@ EMAIL_HOST_PASSWORD = dogmemes123 # default: None
5147
# Screenshots
5248

5349
| ![Login screen](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/desktop_discover.png?raw=true) | ![Discover tab](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/desktop_more_info.png?raw=true) |
54-
| :------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------: |
55-
| Discover (Desktop) | More Info (Desktop) |
50+
| :-: | :-: |
51+
| Discover (Desktop) | More Info (Desktop) |
5652

5753
| ![More Info Tab](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/desktop_modal_episode_selection.png?raw=true) | ![Content Preview Modal](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/desktop_modal_filter.png?raw=true) |
58-
| :----------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------: |
59-
| Episode Selection Modal (Desktop) | Filter Modal (Desktop) |
54+
| :-: | :-: |
55+
| Episode Selection Modal (Desktop) | Filter Modal (Desktop) |
6056

6157
| ![Discover Tab Mobile](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/desktop_modal_preview.png?raw=true) | ![More Info Tab Mobile](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/desktop_sign_in.png?raw=true) |
62-
| :------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------: |
63-
| Preview Modal (Desktop) | Sign In (Desktop) |
58+
| :-: | :-: |
59+
| Preview Modal (Desktop) | Sign In (Desktop) |
6460

6561
| ![Discover Tab Mobile](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/mobile_discover.png?raw=true) | ![More Info Tab Mobile](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/mobile_more_info.png?raw=true) |
66-
| :------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------: |
67-
| Discover (Mobile) | More Info (Mobile) |
62+
| :-: | :-: |
63+
| Discover (Mobile) | More Info (Mobile) |
6864

6965
| ![Discover Tab Mobile](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/mobile_modal_episode_selection.png?raw=true) | ![More Info Tab Mobile](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/mobile_modal_filter.png?raw=true) |
70-
| :---------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------: |
71-
| Episode Selection Modal (Mobile) | Filter Modal (Mobile) |
66+
| :-: | :-: |
67+
| Episode Selection Modal (Mobile) | Filter Modal (Mobile) |
7268

7369
| ![Discover Tab Mobile](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/mobile_registration.png?raw=true) | ![More Info Tab Mobile](https://github.com/Archmonger/Conreq/blob/main/misc/screenshots/mobile_sign_in.png?raw=true) |
74-
| :----------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------: |
75-
| Registration (Mobile) | Sign In (Mobile) |
70+
| :-: | :-: |
71+
| Registration (Mobile) | Sign In (Mobile) |

‎conreq/settings.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
MYSQL_CONFIG_FILE = get_str_from_env("MYSQL_CONFIG_FILE", "")
6767
SSL_SECURITY = get_bool_from_env("SSL_SECURITY", False)
6868
PWNED_VALIDATOR = get_bool_from_env("PWNED_VALIDATOR", True)
69-
X_FRAME_OPTIONS = get_str_from_env("X_FRAME_OPTIONS", "DENY")
7069
BASE_URL = get_base_url()
7170

7271

@@ -303,9 +302,6 @@
303302

304303

305304
# Enabling apps/middleware based on flags
306-
if X_FRAME_OPTIONS.lower() != "false" and not DEBUG:
307-
# Block embedding conreq
308-
MIDDLEWARE.append("django.middleware.clickjacking.XFrameOptionsMiddleware")
309305
if DEBUG:
310306
# Performance analysis tools
311307
INSTALLED_APPS.append("silk")
@@ -373,7 +369,7 @@
373369
"TIMEOUT": 300, # Django setting for default timeout of each key.
374370
"SHARDS": 8, # Number of "sharded" cache dbs to create
375371
"DATABASE_TIMEOUT": 0.25, # 250 milliseconds
376-
"OPTIONS": {"size_limit": 2 ** 30}, # 1 gigabyte
372+
"OPTIONS": {"size_limit": 2**30}, # 1 gigabyte
377373
}
378374
}
379375

0 commit comments

Comments
 (0)