6.2: no more ip verification

- removed ip verification and updated privacy policy to reflect this change.
- streamable links now last for 20 seconds instead of 2 minutes.
- cleaned up stream verification algorithm. now the same function isn't run 4 times in a row.
- removed deprecated way of hosting a cobalt instance.

src/modules/pageRender/page.js

@@ -364,6 +364,7 @@ export default function(obj) {
             body: `<div id="desc-error" class="desc-padding subtext"></div>`
         })}
         <div id="popup-backdrop" style="visibility: hidden;" onclick="hideAllPopups()"></div>
+        <div id="urgent-notice" class="urgent-notice explanation center" onclick="popup('about', 1, 'changelog')" style="visibility: hidden;">${emoji("🎉", 18)} ${t("UrgentUpdate6")}</div>
         <div id="cobalt-main-box" class="center" style="visibility: hidden;">
             <div id="logo">${appName}</div>
             <div id="download-area">

src/modules/processing/match.js

@@ -123,7 +123,7 @@ export default async function (host, patternMatch, url, lang, obj) {
 
         if (r.error) return apiJSON(0, { t: Array.isArray(r.error) ? loc(lang, r.error[0], r.error[1]) : loc(lang, r.error) });
 
-        return matchActionDecider(r, host, obj.ip, obj.aFormat, isAudioOnly, lang, isAudioMuted);
+        return matchActionDecider(r, host, obj.aFormat, isAudioOnly, lang, isAudioMuted);
     } catch (e) {
         return apiJSON(0, { t: genericError(lang, host) })
     }

src/modules/processing/matchActionDecider.js

@@ -2,13 +2,12 @@ import { audioIgnore, services, supportedAudio } from "../config.js";
 import { apiJSON } from "../sub/utils.js";
 import loc from "../../localization/manager.js";
 
-export default function(r, host, ip, audioFormat, isAudioOnly, lang, isAudioMuted) {
+export default function(r, host, audioFormat, isAudioOnly, lang, isAudioMuted) {
     let action,
         responseType = 2,
         defaultParams = {
             u: r.urls,
             service: host,
-            ip: ip,
             filename: r.filename,
         },
         params = {}

src/modules/setup.js

@@ -28,7 +28,7 @@ console.log(
 )
 
 console.log(
-    `\n${Bright("⚠️ Please notice that since v.6.0 cobalt is hosted in two parts. API and web app are now separate.\nMerged hosting is deprecated and will be removed in the future.")}`
+    `\n${Bright("⚠️ Please notice that since v.6.0 cobalt is hosted in two parts. API and web app are now separate.\nMerged hosting is no longer available.")}`
 )
 function setup() {
     console.log(Bright("\nWhat kind of server will this instance be?\nOptions: api, web."));

src/modules/stream/manage.js

@@ -15,7 +15,7 @@ streamCache.on("expired", (key) => {
 export function createStream(obj) {
     let streamID = nanoid(),
         exp = Math.floor(new Date().getTime()) + streamLifespan,
-        ghmac = sha256(`${streamID},${obj.ip},${obj.service},${exp}`, streamSalt);
+        ghmac = sha256(`${streamID},${obj.service},${exp}`, streamSalt);
 
     if (!streamCache.has(streamID)) {
         streamCache.set(streamID, {
@@ -25,7 +25,6 @@ export function createStream(obj) {
             urls: obj.u,
             filename: obj.filename,
             hmac: ghmac,
-            ip: obj.ip,
             exp: exp,
             isAudioOnly: !!obj.isAudioOnly,
             audioFormat: obj.audioFormat,
@@ -42,19 +41,17 @@ export function createStream(obj) {
     return `${process.env.apiURL || process.env.selfURL}api/stream?t=${streamID}&e=${exp}&h=${ghmac}`;
 }
 
-export function verifyStream(ip, id, hmac, exp) {
+export function verifyStream(id, hmac, exp) {
     try {
-        if (id.toString().length === 21) {
-            let streamInfo = streamCache.get(id.toString());
-            if (!streamInfo) return { error: "requested stream does not exist", status: 400 };
-    
-            let ghmac = sha256(`${id},${ip},${streamInfo.service},${exp}`, streamSalt);
-            if (String(hmac) === ghmac && String(exp) === String(streamInfo.exp) && ghmac === String(streamInfo.hmac)
-                && String(ip) === streamInfo.ip && Number(exp) > Math.floor(new Date().getTime())) {
-                return streamInfo;
-            }
+        let streamInfo = streamCache.get(id.toString());
+        if (!streamInfo) return { error: "this download link has expired or doesn't exist. go back and try again!", status: 400 };
+
+        let ghmac = sha256(`${id},${streamInfo.service},${exp}`, streamSalt);
+        if (String(hmac) === ghmac && String(exp) === String(streamInfo.exp) && ghmac === String(streamInfo.hmac)
+            && Number(exp) > Math.floor(new Date().getTime())) {
+            return streamInfo;
         }
-        return { error: "i couldn't verify whether you have access to this download. try again or refresh the page!", status: 401 };
+        return { error: "i couldn't verify if you have access to this download. go back and try again!", status: 401 };
     } catch (e) {
         return { status: 500, body: { status: "error", text: "Internal Server Error" } };
     }

src/modules/stream/stream.js

@@ -1,14 +1,7 @@
-import { apiJSON } from "../sub/utils.js";
-import { verifyStream } from "./manage.js";
 import { streamAudioOnly, streamDefault, streamLiveRender, streamVideoOnly } from "./types.js";
 
-export default function(res, ip, id, hmac, exp) {
+export default async function(res, streamInfo) {
     try {
-        let streamInfo = verifyStream(ip, id, hmac, exp);
-        if (streamInfo.error) {
-            res.status(streamInfo.status).json(apiJSON(0, { t: streamInfo.error }).body);
-            return;
-        }
         if (streamInfo.isAudioOnly && streamInfo.type !== "bridge") {
             streamAudioOnly(streamInfo, res);
             return;

src/modules/sub/utils.js

@@ -73,7 +73,6 @@ export function cleanURL(url, host) {
         case "tiktok":
             url = url.replace(/@([a-zA-Z]+(\.[a-zA-Z]+)+)/, "@a")
         case "pinterest":
-            // Redirect all TLDs back to .com
             url = url.replace(/:\/\/(?:www.)pinterest(?:\.[a-z.]+)/, "://pinterest.com")
         default:
             url = url.split('?')[0];