search now requires authentication

jina-ai · Nov 1, 2024 · 710359b · 710359b
1 parent 5d86565
commit 710359b
Showing 1 changed file with 32 additions and 43 deletions.
diff --git a/backend/functions/src/cloud-functions/searcher.ts b/backend/functions/src/cloud-functions/searcher.ts
@@ -93,6 +93,10 @@ export class SearcherHost extends RPCHost {
         const noSlashPath = decodeURIComponent(ctx.req.path).slice(1);
         if (!noSlashPath && !q) {
             const latestUser = uid ? await auth.assertUser() : undefined;
+            const index = this.crawler.getIndex(latestUser);
+            if (!uid) {
+                index.note = 'Authentication is required to use this endpoint. Please provide a valid API key via Authorization header.';
+            }
             if (!ctx.req.accepts('text/plain') && (ctx.req.accepts('text/json') || ctx.req.accepts('application/json'))) {
 
                 return this.crawler.getIndex(latestUser);
@@ -103,51 +107,36 @@ export class SearcherHost extends RPCHost {
             );
         }
 
-        if (uid) {
-            const user = await auth.assertUser();
-            if (!(user.wallet.total_balance > 0)) {
-                throw new InsufficientBalanceError(`Account balance not enough to run this query, please recharge.`);
-            }
+        const user = await auth.assertUser();
+        if (!(user.wallet.total_balance > 0)) {
+            throw new InsufficientBalanceError(`Account balance not enough to run this query, please recharge.`);
+        }
 
-            const rateLimitPolicy = auth.getRateLimits(rpcReflect.name.toUpperCase()) || [
-                parseInt(user.metadata?.speed_level) >= 2 ?
-                    RateLimitDesc.from({
-                        occurrence: 100,
-                        periodSeconds: 60
-                    }) :
-                    RateLimitDesc.from({
-                        occurrence: 40,
-                        periodSeconds: 60
-                    })
-            ];
-
-            const apiRoll = await this.rateLimitControl.simpleRPCUidBasedLimit(
-                rpcReflect, uid, [rpcReflect.name.toUpperCase()],
-                ...rateLimitPolicy
-            );
+        const rateLimitPolicy = auth.getRateLimits(rpcReflect.name.toUpperCase()) || [
+            parseInt(user.metadata?.speed_level) >= 2 ?
+                RateLimitDesc.from({
+                    occurrence: 100,
+                    periodSeconds: 60
+                }) :
+                RateLimitDesc.from({
+                    occurrence: 40,
+                    periodSeconds: 60
+                })
+        ];
+
+        const apiRoll = await this.rateLimitControl.simpleRPCUidBasedLimit(
+            rpcReflect, uid!, [rpcReflect.name.toUpperCase()],
+            ...rateLimitPolicy
+        );
 
-            rpcReflect.finally(() => {
-                if (chargeAmount) {
-                    auth.reportUsage(chargeAmount, `reader-${rpcReflect.name}`).catch((err) => {
-                        this.logger.warn(`Unable to report usage for ${uid}`, { err: marshalErrorLike(err) });
-                    });
-                    apiRoll.chargeAmount = chargeAmount;
-                }
-            });
-        } else if (ctx.req.ip) {
-            this.threadLocal.set('ip', ctx.req.ip);
-            const apiRoll = await this.rateLimitControl.simpleRpcIPBasedLimit(rpcReflect, ctx.req.ip, [rpcReflect.name.toUpperCase()],
-                [
-                    // 5 requests per minute
-                    new Date(Date.now() - 60 * 1000), 5
-                ]
-            );
-            rpcReflect.finally(() => {
-                if (chargeAmount) {
-                    apiRoll.chargeAmount = chargeAmount;
-                }
-            });
-        }
+        rpcReflect.finally(() => {
+            if (chargeAmount) {
+                auth.reportUsage(chargeAmount, `reader-${rpcReflect.name}`).catch((err) => {
+                    this.logger.warn(`Unable to report usage for ${uid}`, { err: marshalErrorLike(err) });
+                });
+                apiRoll.chargeAmount = chargeAmount;
+            }
+        });
 
         delete crawlerOptions.html;