mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 18:22:40 -04:00 
			
		
		
		
	Refs feedback:
- fix requirements.txt - change static CORS regex into configurable tuple list
This commit is contained in:
		
							parent
							
								
									96268655d2
								
							
						
					
					
						commit
						1bb80548d2
					
				| @ -89,6 +89,11 @@ PAPERLESS_EMAIL_SECRET="" | |||||||
| # as is "example.com,www.example.com", but NOT " example.com" or "example.com," | # as is "example.com,www.example.com", but NOT " example.com" or "example.com," | ||||||
| #PAPERLESS_ALLOWED_HOSTS="example.com,www.example.com" | #PAPERLESS_ALLOWED_HOSTS="example.com,www.example.com" | ||||||
| 
 | 
 | ||||||
|  | # If you decide to use Paperless APIs in an ajax calls, you need to add your | ||||||
|  | # servers to the allowed hosts that can do CORS calls. By default Paperless allows  | ||||||
|  | # calls from localhost:8080. The same rules as above how the list should look like. | ||||||
|  | #PAPERLESS_CORS_ALLOWED_HOSTS="localhost:8080,example.com,localhost:8000" | ||||||
|  | 
 | ||||||
| # To host paperless under a subpath url like example.com/paperless you set | # To host paperless under a subpath url like example.com/paperless you set | ||||||
| # this value to /paperless. No trailing slash! | # this value to /paperless. No trailing slash! | ||||||
| # | # | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ chardet==3.0.4 | |||||||
| coverage==4.5.1 | coverage==4.5.1 | ||||||
| coveralls==1.3.0 | coveralls==1.3.0 | ||||||
| dateparser==0.7.0 | dateparser==0.7.0 | ||||||
| django-cors-headers=2.4.0 | django-cors-headers==2.4.0 | ||||||
| django-crispy-forms==1.7.2 | django-crispy-forms==1.7.2 | ||||||
| django-extensions==2.0.7 | django-extensions==2.0.7 | ||||||
| django-filter==1.1.0 | django-filter==1.1.0 | ||||||
|  | |||||||
| @ -94,8 +94,12 @@ MIDDLEWARE_CLASSES = [ | |||||||
|     'django.middleware.clickjacking.XFrameOptionsMiddleware', |     'django.middleware.clickjacking.XFrameOptionsMiddleware', | ||||||
| ] | ] | ||||||
| 
 | 
 | ||||||
| # We allow CORS from localhosts | # We allow CORS from localhost:8080 | ||||||
| CORS_ORIGIN_REGEX_WHITELIST = (r'^(https?:\/\/)?localhost(:[0-9]{4})?$', ) | CORS_ORIGIN_WHITELIST = ("localhost:8080") | ||||||
|  | _allowed_cors_hosts = os.getenv("PAPERLESS_CORS_ALLOWED_HOSTS") | ||||||
|  | if _allowed_cors_hosts: | ||||||
|  |     CORS_ORIGIN_WHITELIST = tuple(_allowed_cors_hosts.split(",")) | ||||||
|  | 
 | ||||||
| 
 | 
 | ||||||
| # If auth is disabled, we just use our "bypass" authentication middleware | # If auth is disabled, we just use our "bypass" authentication middleware | ||||||
| if bool(os.getenv("PAPERLESS_DISABLE_LOGIN", "false").lower() in ("yes", "y", "1", "t", "true")): | if bool(os.getenv("PAPERLESS_DISABLE_LOGIN", "false").lower() in ("yes", "y", "1", "t", "true")): | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user