[RTY-260032]: merge sanitize url logic in valid check time

Author: Ravindrayadav04

app/main.py

@@ -115,26 +115,6 @@ async def lifespan(app: FastAPI):
     name="qr",
 )
 
-# -----------------------------
-# Global error handler
-# -----------------------------
-# @app.exception_handler(Exception)
-# async def global_exception_handler(request: Request, exc: Exception):
-#  traceback.print_exc()
-#  return JSONResponse(
-#        status_code=500,
-#        content={"success": False, "error": "INTERNAL_SERVER_ERROR"},
-#    )
-
-
-# @app.exception_handler(404)
-# async def custom_404_handler(request: Request, exc):
-#    return templates.TemplateResponse(
-#        "404.html",
-#        {"request": request},
-#        status_code=404,
-#    )
-
 
 @app.exception_handler(FastAPIHTTPException)
 async def http_exception_handler(request: Request, exc: FastAPIHTTPException):

app/routes.py

@@ -35,7 +35,7 @@
     rev_cache,
 )
 from app.utils.config import DOMAIN, MAX_RECENT_URLS, CACHE_PURGE_TOKEN, QR_DIR
-from app.utils.helper import generate_code, is_valid_url, sanitize_url, format_date
+from app.utils.helper import generate_code, is_valid_url, format_date
 from app.utils.qr import generate_qr_with_logo
 
 # templates = Jinja2Templates(directory=str(BASE_DIR / "templates"))
@@ -98,7 +98,6 @@ async def create_short_url(
     qr_type: str = Form("short"),
 ):
     session = request.session
-    original_url = sanitize_url(original_url)
 
     if not original_url or not is_valid_url(original_url):
         session["error"] = "Please enter a valid URL."
@@ -330,7 +329,7 @@ class ShortenRequest(BaseModel):
 
 @api_v1.post("/shorten")
 def shorten_api(payload: ShortenRequest):
-    original_url = sanitize_url(payload.url)
+    original_url = payload.url
     if not is_valid_url(original_url):
         return JSONResponse(status_code=400, content={"error": "INVALID_URL"})
 

app/utils/helper.py

@@ -9,6 +9,8 @@
 
 
 def is_valid_url(url: str) -> bool:
+    url = url.strip()  # sanitize here
+
     try:
         parsed = urlparse(url)
 
@@ -26,10 +28,6 @@ def is_valid_url(url: str) -> bool:
         if hostname is None:
             return False
 
-        # Block localhost
-        if hostname == "localhost":
-            return False
-
         # Block private / loopback IPs
         try:
             ip = ipaddress.ip_address(hostname)
@@ -45,12 +43,6 @@ def is_valid_url(url: str) -> bool:
         return False
 
 
-def sanitize_url(url: str) -> str:
-    url = url.strip()
-
-    return url
-
-
 def generate_code(length: int = SHORT_CODE_LENGTH) -> str:
     chars = string.ascii_letters + string.digits
     return "".join(random.choice(chars) for _ in range(length))