forked from open-webui/open-webui
		
	Start by renaming variables to something more generic. This will give us a bit more flexibility as we look to other session management mechanisms.
This commit is contained in:
		
							parent
							
								
									b2fae0643e
								
							
						
					
					
						commit
						d67f3d982b
					
				
					 4 changed files with 11 additions and 7 deletions
				
			
		|  | @ -25,7 +25,7 @@ ENV OLLAMA_API_BASE_URL "/ollama/api" | |||
| ENV OPENAI_API_BASE_URL "" | ||||
| ENV OPENAI_API_KEY "" | ||||
| 
 | ||||
| ENV WEBUI_JWT_SECRET_KEY "SECRET_KEY" | ||||
| ENV WEBUI_SECRET_KEY "" | ||||
| 
 | ||||
| WORKDIR /app/backend | ||||
| 
 | ||||
|  |  | |||
|  | @ -98,12 +98,15 @@ WEBUI_VERSION = os.environ.get("WEBUI_VERSION", "v1.0.0-alpha.61") | |||
| WEBUI_AUTH = True | ||||
| 
 | ||||
| #################################### | ||||
| # WEBUI_JWT_SECRET_KEY | ||||
| # WEBUI_SECRET_KEY | ||||
| #################################### | ||||
| 
 | ||||
| WEBUI_JWT_SECRET_KEY = os.environ.get("WEBUI_JWT_SECRET_KEY", "t0p-s3cr3t") | ||||
| WEBUI_SECRET_KEY = os.environ.get( | ||||
|     "WEBUI_SECRET_KEY", | ||||
|     os.environ.get("WEBUI_JWT_SECRET_KEY", "t0p-s3cr3t")  # DEPRECATED: remove at next major version | ||||
| ) | ||||
| 
 | ||||
| if WEBUI_AUTH and WEBUI_JWT_SECRET_KEY == "": | ||||
| if WEBUI_AUTH and WEBUI_SECRET_KEY == "": | ||||
|     raise ValueError(ERROR_MESSAGES.ENV_VAR_NOT_FOUND) | ||||
| 
 | ||||
| #################################### | ||||
|  |  | |||
|  | @ -14,7 +14,7 @@ import config | |||
| logging.getLogger("passlib").setLevel(logging.ERROR) | ||||
| 
 | ||||
| 
 | ||||
| JWT_SECRET_KEY = config.WEBUI_JWT_SECRET_KEY | ||||
| SESSION_SECRET = config.WEBUI_SECRET_KEY | ||||
| ALGORITHM = "HS256" | ||||
| 
 | ||||
| ############## | ||||
|  | @ -42,13 +42,13 @@ def create_token(data: dict, expires_delta: Union[timedelta, None] = None) -> st | |||
|         expire = datetime.utcnow() + expires_delta | ||||
|         payload.update({"exp": expire}) | ||||
| 
 | ||||
|     encoded_jwt = jwt.encode(payload, JWT_SECRET_KEY, algorithm=ALGORITHM) | ||||
|     encoded_jwt = jwt.encode(payload, SESSION_SECRET, algorithm=ALGORITHM) | ||||
|     return encoded_jwt | ||||
| 
 | ||||
| 
 | ||||
| def decode_token(token: str) -> Optional[dict]: | ||||
|     try: | ||||
|         decoded = jwt.decode(token, JWT_SECRET_KEY, options={"verify_signature": False}) | ||||
|         decoded = jwt.decode(token, SESSION_SECRET, options={"verify_signature": False}) | ||||
|         return decoded | ||||
|     except Exception as e: | ||||
|         return None | ||||
|  |  | |||
|  | @ -26,6 +26,7 @@ services: | |||
|       - ${OLLAMA_WEBUI_PORT-3000}:8080 | ||||
|     environment: | ||||
|       - 'OLLAMA_API_BASE_URL=http://ollama:11434/api' | ||||
|       - 'WEBUI_SECRET_KEY=' | ||||
|     extra_hosts: | ||||
|       - host.docker.internal:host-gateway | ||||
|     restart: unless-stopped | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue