@budibase/backend-core 3.38.5 → 3.39.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +11 -11
- package/dist/index.js.map +3 -3
- package/dist/package.json +2 -2
- package/dist/plugins.js +1 -1
- package/dist/src/blacklist/blacklist.d.ts +1 -0
- package/dist/src/blacklist/blacklist.js +17 -13
- package/dist/src/blacklist/blacklist.js.map +1 -1
- package/dist/src/cache/base/index.d.ts +3 -0
- package/dist/src/cache/base/index.js +11 -0
- package/dist/src/cache/base/index.js.map +1 -1
- package/dist/src/cache/generic.d.ts +1 -0
- package/dist/src/cache/generic.js +3 -1
- package/dist/src/cache/generic.js.map +1 -1
- package/dist/src/events/publishers/ai.d.ts +13 -1
- package/dist/src/events/publishers/ai.js +42 -0
- package/dist/src/events/publishers/ai.js.map +1 -1
- package/dist/src/security/sessions.js +1 -3
- package/dist/src/security/sessions.js.map +1 -1
- package/dist/src/utils/index.d.ts +1 -0
- package/dist/src/utils/index.js +1 -0
- package/dist/src/utils/index.js.map +1 -1
- package/dist/src/utils/outboundFetch.d.ts +3 -1
- package/dist/src/utils/outboundFetch.js +45 -5
- package/dist/src/utils/outboundFetch.js.map +1 -1
- package/dist/src/utils/session.d.ts +2 -0
- package/dist/src/utils/session.js +21 -0
- package/dist/src/utils/session.js.map +1 -0
- package/dist/src/utils/utils.d.ts +4 -0
- package/dist/src/utils/utils.js +32 -4
- package/dist/src/utils/utils.js.map +1 -1
- package/dist/tests/core/utilities/mocks/licenses.d.ts +1 -0
- package/dist/tests/core/utilities/mocks/licenses.js +5 -1
- package/dist/tests/core/utilities/mocks/licenses.js.map +1 -1
- package/package.json +2 -2
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.39.15",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -110,5 +110,5 @@
|
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
},
|
|
113
|
-
"gitHead": "
|
|
113
|
+
"gitHead": "e409b00d4727dd9f3c5ba22401aa3d0d8c062cba"
|
|
114
114
|
}
|
package/dist/plugins.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
"use strict";var b=Object.create;var T=Object.defineProperty;var N=Object.getOwnPropertyDescriptor;var
|
|
1
|
+
"use strict";var b=Object.create;var T=Object.defineProperty;var N=Object.getOwnPropertyDescriptor;var P=Object.getOwnPropertyNames;var D=Object.getPrototypeOf,A=Object.prototype.hasOwnProperty;var l=(t,n)=>T(t,"name",{value:n,configurable:!0});var x=(t,n)=>{for(var i in n)T(t,i,{get:n[i],enumerable:!0})},L=(t,n,i,o)=>{if(n&&typeof n=="object"||typeof n=="function")for(let R of P(n))!A.call(t,R)&&R!==i&&T(t,R,{get:()=>n[R],enumerable:!(o=N(n,R))||o.enumerable});return t};var U=(t,n,i)=>(i=t!=null?b(D(t)):{},L(n||!t||!t.__esModule?T(i,"default",{value:t,enumerable:!0}):i,t)),G=t=>L(T({},"__esModule",{value:!0}),t);var j={};x(j,{validate:()=>B});module.exports=G(j);var O=(o=>(o.SQL="sql",o.JSON="json",o.FIELDS="fields",o))(O||{}),c=(a=>(a.STRING="string",a.CODE="code",a.LONGFORM="longForm",a.SENSITIVE_LONGFORM="sensitiveLongForm",a.BOOLEAN="boolean",a.NUMBER="number",a.PASSWORD="password",a.LIST="list",a.OBJECT="object",a.JSON="json",a.FILE="file",a.FIELD_GROUP="fieldGroup",a.SELECT="select",a))(c||{});var p=(i=>(i.CONNECTION_CHECKING="connection",i.FETCH_TABLE_NAMES="fetch_table_names",i))(p||{});var u=(E=>(E.OBJECT="object",E.STRING="string",E.BOOLEAN="boolean",E.NUMBER="number",E.ARRAY="array",E.JSON="json",E.DATE="date",E.DATETIME="datetime",E.ATTACHMENT="attachment",E.LONGFORM="longform",E))(u||{}),_=(s=>(s.TABLE="table",s.ROW="row",s.ROWS="rows",s.WIDE="wide",s.QUERY="query",s.QUERY_PARAMS="queryParams",s.QUERY_LIMIT="queryLimit",s.LOOP_OPTION="loopOption",s.ITEM="item",s.CODE="code",s.FILTERS="filters",s.COLUMN="column",s.TRIGGER_SCHEMA="triggerSchema",s.CRON="cron",s.WEBHOOK_URL="webhookUrl",s.AUTOMATION="automation",s.AUTOMATION_FIELDS="automationFields",s.MULTI_ATTACHMENTS="multi_attachments",s.TRIGGER_FILTER="trigger_filter",s.CATEGORIES="categories",s.AGENT="agent",s.OUTPUT_SCHEMA="outputSchema",s))(_||{}),m=(g=>(g.ROW_SAVED="ROW_SAVED",g.ROW_UPDATED="ROW_UPDATED",g.ROW_DELETED="ROW_DELETED",g.WEBHOOK="WEBHOOK",g.APP="APP",g.CRON="CRON",g.ROW_ACTION="ROW_ACTION",g.EMAIL="EMAIL",g))(m||{});var C=(r=>(r.SEND_EMAIL_SMTP="SEND_EMAIL_SMTP",r.CREATE_ROW="CREATE_ROW",r.GET_ROW="GET_ROW",r.UPDATE_ROW="UPDATE_ROW",r.DELETE_ROW="DELETE_ROW",r.QUERY_ROWS="QUERY_ROWS",r.EXECUTE_BASH="EXECUTE_BASH",r.OUTGOING_WEBHOOK="OUTGOING_WEBHOOK",r.EXECUTE_SCRIPT="EXECUTE_SCRIPT",r.EXECUTE_SCRIPT_V2="EXECUTE_SCRIPT_V2",r.EXECUTE_QUERY="EXECUTE_QUERY",r.SERVER_LOG="SERVER_LOG",r.DELAY="DELAY",r.FILTER="FILTER",r.API_REQUEST="API_REQUEST",r.LOOP="LOOP",r.COLLECT="COLLECT",r.OPENAI="OPENAI",r.TRIGGER_AUTOMATION_RUN="TRIGGER_AUTOMATION_RUN",r.BRANCH="BRANCH",r.CLASSIFY_CONTENT="CLASSIFY_CONTENT",r.PROMPT_LLM="PROMPT_LLM",r.TRANSLATE="TRANSLATE",r.SUMMARISE="SUMMARISE",r.GENERATE_TEXT="GENERATE_TEXT",r.EXTRACT_FILE_DATA="EXTRACT_FILE_DATA",r.EXTRACT_STATE="EXTRACT_STATE",r.LOOP_V2="LOOP_V2",r.AGENT="AGENT",r.discord="discord",r.slack="slack",r.zapier="zapier",r.integromat="integromat",r.n8n="n8n",r))(C||{}),f=[...Object.values(C),...Object.values(m)];var e=U(require("joi"));var I=["Relational","Non-relational","Spreadsheet","Object store","Graph","API"];function d(t,n){let{error:i}=t.validate(n);if(i)throw i}l(d,"runJoi");function y(t){let n=e.default.object({type:e.default.string().allow("component").required(),metadata:e.default.object().unknown(!0).required(),hash:e.default.string().optional(),version:e.default.string().optional(),schema:e.default.object({name:e.default.string().required(),settings:e.default.array().items(e.default.object().unknown(!0)).required()}).unknown(!0)});d(n,t)}l(y,"validateComponent");function M(t){let n=e.default.object({type:e.default.string().allow(...Object.values(c)).required(),required:e.default.boolean().required(),default:e.default.any(),display:e.default.string()}),i=e.default.object({type:e.default.string().allow(...Object.values(O)),readable:e.default.boolean(),displayName:e.default.string(),fields:e.default.object().pattern(e.default.string(),n)}).required(),o=e.default.object({type:e.default.string().allow("datasource").required(),metadata:e.default.object().unknown(!0).required(),hash:e.default.string().optional(),version:e.default.string().optional(),schema:e.default.object({docs:e.default.string(),plus:e.default.boolean().optional(),isSQL:e.default.boolean().optional(),auth:e.default.object({type:e.default.string().required()}).optional(),features:e.default.object(Object.fromEntries(Object.values(p).map(R=>[R,e.default.boolean().optional()]))).optional(),relationships:e.default.boolean().optional(),description:e.default.string().required(),friendlyName:e.default.string().required(),type:e.default.string().allow(...I),datasource:e.default.object().pattern(e.default.string(),n).required(),query:e.default.object().pattern(e.default.string(),i).unknown(!0).required(),extra:e.default.object().pattern(e.default.string(),e.default.object({type:e.default.string().required(),displayName:e.default.string().required(),required:e.default.boolean(),data:e.default.object()}))})});d(o,t)}l(M,"validateDatasource");function S(t){let n=e.default.object().pattern(e.default.string(),{type:e.default.string().allow(...Object.values(u)).required(),customType:e.default.string().allow(...Object.values(_)),title:e.default.string(),description:e.default.string(),enum:e.default.array().items(e.default.string()),pretty:e.default.array().items(e.default.string())}),i=e.default.object({properties:n,required:e.default.array().items(e.default.string())}).concat(n).required(),o=e.default.object({type:e.default.string().allow("automation").required(),metadata:e.default.object().unknown(!0).required(),hash:e.default.string().optional(),version:e.default.string().optional(),schema:e.default.object({name:e.default.string().required(),tagline:e.default.string().required(),icon:e.default.string().required(),description:e.default.string().required(),type:e.default.string().allow("ACTION","LOGIC").required(),stepId:e.default.string().disallow(...f).required(),inputs:e.default.object().optional(),schema:e.default.object({inputs:i,outputs:i}).required()})});d(o,t)}l(S,"validateAutomation");function B(t){switch(t?.type){case"component":y(t);break;case"datasource":M(t);break;case"automation":S(t);break;default:throw new Error(`Unknown plugin type - check schema.json: ${t.type}`)}}l(B,"validate");0&&(module.exports={validate});
|
|
2
2
|
//# sourceMappingURL=plugins.js.map
|
|
@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.resolveAddress = resolveAddress;
|
|
15
16
|
exports.refreshBlacklist = refreshBlacklist;
|
|
16
17
|
exports.isBlacklisted = isBlacklisted;
|
|
17
18
|
const dns_1 = __importDefault(require("dns"));
|
|
@@ -76,6 +77,14 @@ function lookup(address) {
|
|
|
76
77
|
return addresses.map(addr => addr.address);
|
|
77
78
|
});
|
|
78
79
|
}
|
|
80
|
+
function resolveAddress(address) {
|
|
81
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
82
|
+
if (!net_1.default.isIP(address)) {
|
|
83
|
+
return lookup(address);
|
|
84
|
+
}
|
|
85
|
+
return [address];
|
|
86
|
+
});
|
|
87
|
+
}
|
|
79
88
|
function addEntryToBlacklist(blockList, entry) {
|
|
80
89
|
const trimmed = entry.trim();
|
|
81
90
|
if (!trimmed) {
|
|
@@ -135,20 +144,15 @@ function isBlacklisted(address) {
|
|
|
135
144
|
yield refreshBlacklist();
|
|
136
145
|
}
|
|
137
146
|
let ips;
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
ips = yield lookup(address);
|
|
141
|
-
}
|
|
142
|
-
catch (e) {
|
|
143
|
-
if (e instanceof TypeError) {
|
|
144
|
-
console.error("Black list error: could not parse address: ", address);
|
|
145
|
-
return true;
|
|
146
|
-
}
|
|
147
|
-
return shouldApplyDefaultBlacklist();
|
|
148
|
-
}
|
|
147
|
+
try {
|
|
148
|
+
ips = yield resolveAddress(address);
|
|
149
149
|
}
|
|
150
|
-
|
|
151
|
-
|
|
150
|
+
catch (e) {
|
|
151
|
+
if (e instanceof TypeError) {
|
|
152
|
+
console.error("Black list error: could not parse address: ", address);
|
|
153
|
+
return true;
|
|
154
|
+
}
|
|
155
|
+
return shouldApplyDefaultBlacklist();
|
|
152
156
|
}
|
|
153
157
|
return ips.some(ip => blackList.check(ip, getIpVersion(ip)));
|
|
154
158
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blacklist.js","sourceRoot":"","sources":["../../../src/blacklist/blacklist.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"blacklist.js","sourceRoot":"","sources":["../../../src/blacklist/blacklist.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,6 +59,9 @@ export default class BaseCache {
|
|
|
59
59
|
useTenancy: boolean;
|
|
60
60
|
}): Promise<T>;
|
|
61
61
|
bustCache(key: string): Promise<void>;
|
|
62
|
+
increment(key: string, ttlSeconds?: number, opts?: {
|
|
63
|
+
useTenancy: boolean;
|
|
64
|
+
}): Promise<number>;
|
|
62
65
|
/**
|
|
63
66
|
* Delete the entry if the provided value matches the stored one.
|
|
64
67
|
*/
|
|
@@ -194,6 +194,17 @@ class BaseCache {
|
|
|
194
194
|
}
|
|
195
195
|
});
|
|
196
196
|
}
|
|
197
|
+
increment(key_1, ttlSeconds_1) {
|
|
198
|
+
return __awaiter(this, arguments, void 0, function* (key, ttlSeconds, opts = { useTenancy: true }) {
|
|
199
|
+
key = opts.useTenancy ? generateTenantKey(key) : key;
|
|
200
|
+
const client = yield this.getClient();
|
|
201
|
+
const count = yield client.increment(key);
|
|
202
|
+
if (ttlSeconds) {
|
|
203
|
+
yield client.setExpiry(key, ttlSeconds);
|
|
204
|
+
}
|
|
205
|
+
return count;
|
|
206
|
+
});
|
|
207
|
+
}
|
|
197
208
|
/**
|
|
198
209
|
* Delete the entry if the provided value matches the stored one.
|
|
199
210
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cache/base/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cache/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA2C;AAC3C,wDAAyC;AAGzC,SAAS,iBAAiB,CAAC,GAAW;IACpC,MAAM,QAAQ,GAAG,IAAA,qBAAW,GAAE,CAAA;IAC9B,OAAO,GAAG,GAAG,IAAI,QAAQ,EAAE,CAAA;AAC7B,CAAC;AAED,MAAqB,SAAS;IAG5B,YAAY,SAA6B,SAAS;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAEK,SAAS;;YACb,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAA;QAClE,CAAC;KAAA;IAEK,IAAI,CAAC,OAAe;;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7B,CAAC;KAAA;IAEK,MAAM;6DAAC,GAAW,EAAE,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YACnD,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC3B,CAAC;KAAA;IAEK,IAAI;6DAAC,GAAW,EAAE,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YACjD,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACzB,CAAC;KAAA;IAED;;OAEG;IACG,GAAG;6DAAC,GAAW,EAAE,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YAChD,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;KAAA;IAED;;OAEG;IACG,OAAO;6DAAI,IAAc,EAAE,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YAC1D,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YACvE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,OAAO,MAAM,CAAC,OAAO,CAAI,IAAI,CAAC,CAAA;QAChC,CAAC;KAAA;IAED;;OAEG;IACG,KAAK;6DACT,GAAW,EACX,KAAU,EACV,MAAqB,IAAI,EACzB,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YAE3B,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;QACrC,CAAC;KAAA;IAED;;OAEG;IACG,SAAS;6DACb,IAAyB,EACzB,MAAqB,IAAI,EACzB,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YAE3B,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAChC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBACpB,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAA;oBACnC,OAAO,GAAG,CAAA;gBACZ,CAAC,EACD,EAAyB,CAC1B,CAAA;YACH,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QACnC,CAAC;KAAA;IAED;;OAEG;IACG,MAAM;6DAAC,GAAW,EAAE,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YACnD,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC3B,CAAC;KAAA;IAED;;OAEG;IACG,UAAU;6DAAC,IAAc,EAAE,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YAC1D,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YACvE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC;KAAA;IAED;;OAEG;IACG,SAAS;6DACb,GAAW,EACX,MAAqB,IAAI,EACzB,OAA6B,EAC7B,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YAE3B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;YAC7C,IAAI,WAAW,EAAE,CAAC;gBAChB,OAAO,WAAW,CAAA;YACpB,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,MAAM,OAAO,EAAE,CAAA;gBAEpC,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;gBAC9C,OAAO,YAAY,CAAA;YACrB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAA;gBACpD,MAAM,GAAG,CAAA;YACX,CAAC;QACH,CAAC;KAAA;IAEK,uBAAuB;6DAC3B,GAAW,EACX,OAAwD,EACxD,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YAE3B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;YAC7C,IAAI,WAAW,EAAE,CAAC;gBAChB,OAAO,WAAW,CAAA;YACpB,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,eAAe,GAAG,MAAM,OAAO,EAAE,CAAA;gBACvC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,eAAe,CAAA;gBACtC,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;oBAChC,UAAU,EAAE,IAAI,CAAC,UAAU;iBAC5B,CAAC,CAAA;gBACF,OAAO,KAAK,CAAA;YACd,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAA;gBACpD,MAAM,GAAG,CAAA;YACX,CAAC;QACH,CAAC;KAAA;IAEK,SAAS,CAAC,GAAW;;YACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;YAC7C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAA;gBAC5C,MAAM,GAAG,CAAA;YACX,CAAC;QACH,CAAC;KAAA;IAEK,SAAS;6DACb,GAAW,EACX,UAAmB,EACnB,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YAE3B,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;YACzC,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;YACzC,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC;KAAA;IAED;;OAEG;IACG,aAAa;6DAAC,GAAW,EAAE,KAAU,EAAE,IAAI,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;YACtE,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;YACrC,MAAM,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACxC,CAAC;KAAA;CACF;AApLD,4BAoLC"}
|
|
@@ -22,4 +22,5 @@ export declare const destroy: (...args: Parameters<typeof GENERIC.delete>) => Pr
|
|
|
22
22
|
export declare const withCache: <T>(...args: Parameters<typeof GENERIC.withCache<T>>) => Promise<T>;
|
|
23
23
|
export declare const withCacheWithDynamicTTL: <T>(...args: Parameters<typeof GENERIC.withCacheWithDynamicTTL<T>>) => Promise<T>;
|
|
24
24
|
export declare const bustCache: (...args: Parameters<typeof GENERIC.bustCache>) => Promise<void>;
|
|
25
|
+
export declare const increment: (...args: Parameters<typeof GENERIC.increment>) => Promise<number>;
|
|
25
26
|
export {};
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.bustCache = exports.withCacheWithDynamicTTL = exports.withCache = exports.destroy = exports.store = exports.get = exports.keys = exports.TTL = exports.CacheKey = void 0;
|
|
6
|
+
exports.increment = exports.bustCache = exports.withCacheWithDynamicTTL = exports.withCache = exports.destroy = exports.store = exports.get = exports.keys = exports.TTL = exports.CacheKey = void 0;
|
|
7
7
|
const base_1 = __importDefault(require("./base"));
|
|
8
8
|
const GENERIC = new base_1.default();
|
|
9
9
|
exports.CacheKey = {
|
|
@@ -36,4 +36,6 @@ const withCacheWithDynamicTTL = (...args) => GENERIC.withCacheWithDynamicTTL(...
|
|
|
36
36
|
exports.withCacheWithDynamicTTL = withCacheWithDynamicTTL;
|
|
37
37
|
const bustCache = (...args) => GENERIC.bustCache(...args);
|
|
38
38
|
exports.bustCache = bustCache;
|
|
39
|
+
const increment = (...args) => GENERIC.increment(...args);
|
|
40
|
+
exports.increment = increment;
|
|
39
41
|
//# sourceMappingURL=generic.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generic.js","sourceRoot":"","sources":["../../../src/cache/generic.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA8B;AAE9B,MAAM,OAAO,GAAG,IAAI,cAAS,EAAE,CAAA;AAElB,QAAA,QAAQ,GAAG;IACtB,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,cAAc;IAC5B,iBAAiB,EAAE,kBAAkB;IACrC,gBAAgB,EAAE,gBAAgB;IAClC,MAAM,EAAE,QAAQ;IAChB,iBAAiB,EAAE,kBAAkB;IACrC,iBAAiB,EAAE,iBAAiB;IACpC,YAAY,EAAE,CAAC,QAAgB,EAAE,EAAE,CAAC,eAAe,QAAQ,EAAE;CAC9D,CAAA;AAED,IAAY,GAIX;AAJD,WAAY,GAAG;IACb,2CAAgB,CAAA;IAChB,wCAAe,CAAA;IACf,uCAAe,CAAA;AACjB,CAAC,EAJW,GAAG,mBAAH,GAAG,QAId;AAEM,MAAM,IAAI,GAAG,CAAC,GAAG,IAAqC,EAAE,EAAE,CAC/D,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;AADV,QAAA,IAAI,QACM;AAChB,MAAM,GAAG,GAAG,CAAC,GAAG,IAAoC,EAAE,EAAE,CAC7D,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;AADT,QAAA,GAAG,OACM;AACf,MAAM,KAAK,GAAG,CAAC,GAAG,IAAsC,EAAE,EAAE,CACjE,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;AADX,QAAA,KAAK,SACM;AACjB,MAAM,OAAO,GAAG,CAAC,GAAG,IAAuC,EAAE,EAAE,CACpE,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA;AADZ,QAAA,OAAO,WACK;AAClB,MAAM,SAAS,GAAG,CACvB,GAAG,IAA6C,EAChD,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAA;AAFlB,QAAA,SAAS,aAES;AACxB,MAAM,uBAAuB,GAAG,CACrC,GAAG,IAA2D,EAC9D,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC,CAAA;AAFhC,QAAA,uBAAuB,2BAES;AACtC,MAAM,SAAS,GAAG,CAAC,GAAG,IAA0C,EAAE,EAAE,CACzE,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAA;AADf,QAAA,SAAS,aACM"}
|
|
1
|
+
{"version":3,"file":"generic.js","sourceRoot":"","sources":["../../../src/cache/generic.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA8B;AAE9B,MAAM,OAAO,GAAG,IAAI,cAAS,EAAE,CAAA;AAElB,QAAA,QAAQ,GAAG;IACtB,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,cAAc;IAC5B,iBAAiB,EAAE,kBAAkB;IACrC,gBAAgB,EAAE,gBAAgB;IAClC,MAAM,EAAE,QAAQ;IAChB,iBAAiB,EAAE,kBAAkB;IACrC,iBAAiB,EAAE,iBAAiB;IACpC,YAAY,EAAE,CAAC,QAAgB,EAAE,EAAE,CAAC,eAAe,QAAQ,EAAE;CAC9D,CAAA;AAED,IAAY,GAIX;AAJD,WAAY,GAAG;IACb,2CAAgB,CAAA;IAChB,wCAAe,CAAA;IACf,uCAAe,CAAA;AACjB,CAAC,EAJW,GAAG,mBAAH,GAAG,QAId;AAEM,MAAM,IAAI,GAAG,CAAC,GAAG,IAAqC,EAAE,EAAE,CAC/D,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;AADV,QAAA,IAAI,QACM;AAChB,MAAM,GAAG,GAAG,CAAC,GAAG,IAAoC,EAAE,EAAE,CAC7D,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;AADT,QAAA,GAAG,OACM;AACf,MAAM,KAAK,GAAG,CAAC,GAAG,IAAsC,EAAE,EAAE,CACjE,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;AADX,QAAA,KAAK,SACM;AACjB,MAAM,OAAO,GAAG,CAAC,GAAG,IAAuC,EAAE,EAAE,CACpE,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA;AADZ,QAAA,OAAO,WACK;AAClB,MAAM,SAAS,GAAG,CACvB,GAAG,IAA6C,EAChD,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAA;AAFlB,QAAA,SAAS,aAES;AACxB,MAAM,uBAAuB,GAAG,CACrC,GAAG,IAA2D,EAC9D,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC,CAAA;AAFhC,QAAA,uBAAuB,2BAES;AACtC,MAAM,SAAS,GAAG,CAAC,GAAG,IAA0C,EAAE,EAAE,CACzE,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAA;AADf,QAAA,SAAS,aACM;AACrB,MAAM,SAAS,GAAG,CAAC,GAAG,IAA0C,EAAE,EAAE,CACzE,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAA;AADf,QAAA,SAAS,aACM"}
|
|
@@ -1,10 +1,16 @@
|
|
|
1
|
-
import { Agent, CustomAIProviderConfig } from "@budibase/types";
|
|
1
|
+
import { Agent, CustomAIProviderConfig, RagFileUploadedEvent, RagFileDeletedEvent, RagFileSharePointConnectedEvent, RagFileSharePointDisconnectedEvent, RagFileSharePointSyncEvent, RagFileProcessedEvent } from "@budibase/types";
|
|
2
2
|
declare function configCreated(config: CustomAIProviderConfig, timestamp?: string | number): void;
|
|
3
3
|
declare function configUpdated(config: CustomAIProviderConfig): void;
|
|
4
4
|
declare function configDeleted(config: CustomAIProviderConfig): void;
|
|
5
5
|
declare function agentCreated(agent: Agent): void;
|
|
6
6
|
declare function agentUpdated(agent: Agent): void;
|
|
7
7
|
declare function agentDeleted(agent: Agent): void;
|
|
8
|
+
declare function ragFileUploaded(event: RagFileUploadedEvent): void;
|
|
9
|
+
declare function ragFileDeleted(event: RagFileDeletedEvent): void;
|
|
10
|
+
declare function ragFileSharePointConnected(event: RagFileSharePointConnectedEvent): void;
|
|
11
|
+
declare function ragFileSharePointDisconnected(event: RagFileSharePointDisconnectedEvent): void;
|
|
12
|
+
declare function ragFileProcessed(event: RagFileProcessedEvent): void;
|
|
13
|
+
declare function ragFileSharePointSync(event: RagFileSharePointSyncEvent): void;
|
|
8
14
|
declare const _default: {
|
|
9
15
|
configCreated: typeof configCreated;
|
|
10
16
|
configUpdated: typeof configUpdated;
|
|
@@ -12,5 +18,11 @@ declare const _default: {
|
|
|
12
18
|
agentCreated: typeof agentCreated;
|
|
13
19
|
agentUpdated: typeof agentUpdated;
|
|
14
20
|
agentDeleted: typeof agentDeleted;
|
|
21
|
+
ragFileUploaded: typeof ragFileUploaded;
|
|
22
|
+
ragFileDeleted: typeof ragFileDeleted;
|
|
23
|
+
ragFileSharePointConnected: typeof ragFileSharePointConnected;
|
|
24
|
+
ragFileSharePointDisconnected: typeof ragFileSharePointDisconnected;
|
|
25
|
+
ragFileSharePointSync: typeof ragFileSharePointSync;
|
|
26
|
+
ragFileProcessed: typeof ragFileProcessed;
|
|
15
27
|
};
|
|
16
28
|
export default _default;
|
|
@@ -65,6 +65,42 @@ function agentDeleted(agent) {
|
|
|
65
65
|
console.error("agentDeleted telemetry failed", { agentId: agent._id, err });
|
|
66
66
|
});
|
|
67
67
|
}
|
|
68
|
+
function ragFileUploaded(event) {
|
|
69
|
+
(0, events_1.publishEvent)(types_1.Event.RAG_FILE_UPLOADED, event).catch(err => {
|
|
70
|
+
console.error("ragFileUploaded telemetry failed", { event, err });
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
function ragFileDeleted(event) {
|
|
74
|
+
(0, events_1.publishEvent)(types_1.Event.RAG_FILE_DELETED, event).catch(err => {
|
|
75
|
+
console.error("ragFileDeleted telemetry failed", { event, err });
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
function ragFileSharePointConnected(event) {
|
|
79
|
+
(0, events_1.publishEvent)(types_1.Event.RAG_FILE_SHAREPOINT_CONNECTED, event).catch(err => {
|
|
80
|
+
console.error("ragFileSharePointConnected telemetry failed", {
|
|
81
|
+
event,
|
|
82
|
+
err,
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
function ragFileSharePointDisconnected(event) {
|
|
87
|
+
(0, events_1.publishEvent)(types_1.Event.RAG_FILE_SHAREPOINT_DISCONNECTED, event).catch(err => {
|
|
88
|
+
console.error("ragFileSharePointDisconnected telemetry failed", {
|
|
89
|
+
event,
|
|
90
|
+
err,
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
function ragFileProcessed(event) {
|
|
95
|
+
(0, events_1.publishEvent)(types_1.Event.RAG_FILE_PROCESSED, event).catch(err => {
|
|
96
|
+
console.error("ragFileProcessed telemetry failed", { event, err });
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
function ragFileSharePointSync(event) {
|
|
100
|
+
(0, events_1.publishEvent)(types_1.Event.RAG_FILE_SHAREPOINT_SYNC, event).catch(err => {
|
|
101
|
+
console.error("ragFileSharePointSync telemetry failed", { event, err });
|
|
102
|
+
});
|
|
103
|
+
}
|
|
68
104
|
exports.default = {
|
|
69
105
|
configCreated,
|
|
70
106
|
configUpdated,
|
|
@@ -72,5 +108,11 @@ exports.default = {
|
|
|
72
108
|
agentCreated,
|
|
73
109
|
agentUpdated,
|
|
74
110
|
agentDeleted,
|
|
111
|
+
ragFileUploaded,
|
|
112
|
+
ragFileDeleted,
|
|
113
|
+
ragFileSharePointConnected,
|
|
114
|
+
ragFileSharePointDisconnected,
|
|
115
|
+
ragFileSharePointSync,
|
|
116
|
+
ragFileProcessed,
|
|
75
117
|
};
|
|
76
118
|
//# sourceMappingURL=ai.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai.js","sourceRoot":"","sources":["../../../../src/events/publishers/ai.ts"],"names":[],"mappings":";;AAAA,sCAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"ai.js","sourceRoot":"","sources":["../../../../src/events/publishers/ai.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,9 +58,7 @@ const environment_1 = __importDefault(require("../environment"));
|
|
|
58
58
|
const utils_1 = require("../utils");
|
|
59
59
|
const shared_core_1 = require("@budibase/shared-core");
|
|
60
60
|
// a week expiry is the default
|
|
61
|
-
const EXPIRY_SECONDS =
|
|
62
|
-
? parseInt(environment_1.default.SESSION_EXPIRY_SECONDS)
|
|
63
|
-
: utils_1.Duration.fromDays(7).toSeconds();
|
|
61
|
+
const EXPIRY_SECONDS = (0, utils_1.getSessionExpirySeconds)();
|
|
64
62
|
function makeSessionID(userId, sessionId) {
|
|
65
63
|
return `${userId}/${sessionId}`;
|
|
66
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../src/security/sessions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../src/security/sessions.ts"],"names":[],"mappings":"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"}
|
package/dist/src/utils/index.js
CHANGED
|
@@ -24,4 +24,5 @@ __exportStar(require("./gzip"), exports);
|
|
|
24
24
|
__exportStar(require("./auth"), exports);
|
|
25
25
|
__exportStar(require("./outboundFetch"), exports);
|
|
26
26
|
__exportStar(require("./datasource"), exports);
|
|
27
|
+
__exportStar(require("./session"), exports);
|
|
27
28
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,0CAAuB;AACvB,gDAA6B;AAC7B,6CAA0B;AAC1B,yCAAsB;AACtB,0CAAuB;AACvB,yCAAsB;AACtB,yCAAsB;AACtB,kDAA+B;AAC/B,+CAA4B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,0CAAuB;AACvB,gDAA6B;AAC7B,6CAA0B;AAC1B,yCAAsB;AACtB,0CAAuB;AACvB,yCAAsB;AACtB,yCAAsB;AACtB,kDAA+B;AAC/B,+CAA4B;AAC5B,4CAAyB"}
|
|
@@ -4,6 +4,7 @@ interface FetchRequest {
|
|
|
4
4
|
body?: unknown;
|
|
5
5
|
headers?: unknown;
|
|
6
6
|
redirect?: unknown;
|
|
7
|
+
agent?: unknown;
|
|
7
8
|
}
|
|
8
9
|
interface FetchResponse {
|
|
9
10
|
status: number;
|
|
@@ -14,10 +15,11 @@ interface FetchResponse {
|
|
|
14
15
|
}
|
|
15
16
|
interface FetchWithBlacklistOptions<TRequest extends FetchRequest, TResponse extends FetchResponse> {
|
|
16
17
|
followRedirects?: boolean;
|
|
18
|
+
returnRedirectWithoutLocation?: boolean;
|
|
17
19
|
fetchFn?: (url: string, request: RedirectSafeRequest<TRequest>) => Promise<TResponse>;
|
|
18
20
|
}
|
|
19
21
|
type RedirectSafeRequest<TRequest extends FetchRequest> = TRequest & {
|
|
20
22
|
redirect: "manual";
|
|
21
23
|
};
|
|
22
|
-
export declare function fetchWithBlacklist<TRequest extends FetchRequest = RequestInit, TResponse extends FetchResponse = Response>(url: string, request?: TRequest, { followRedirects, fetchFn, }?: FetchWithBlacklistOptions<TRequest, TResponse>): Promise<TResponse>;
|
|
24
|
+
export declare function fetchWithBlacklist<TRequest extends FetchRequest = RequestInit, TResponse extends FetchResponse = Response>(url: string, request?: TRequest, { followRedirects, returnRedirectWithoutLocation, fetchFn, }?: FetchWithBlacklistOptions<TRequest, TResponse>): Promise<TResponse>;
|
|
23
25
|
export {};
|
|
@@ -41,8 +41,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
41
41
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
42
|
});
|
|
43
43
|
};
|
|
44
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
45
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
46
|
+
};
|
|
44
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
48
|
exports.fetchWithBlacklist = fetchWithBlacklist;
|
|
49
|
+
const http_1 = __importDefault(require("http"));
|
|
50
|
+
const https_1 = __importDefault(require("https"));
|
|
46
51
|
const blacklist_1 = require("../blacklist");
|
|
47
52
|
const node_fetch_1 = __importStar(require("node-fetch"));
|
|
48
53
|
const MAX_REDIRECTS = 5;
|
|
@@ -72,14 +77,35 @@ function parseUrl(url) {
|
|
|
72
77
|
function isRedirect(status) {
|
|
73
78
|
return [301, 302, 303, 307, 308].includes(status);
|
|
74
79
|
}
|
|
75
|
-
function
|
|
80
|
+
function resolveSafePinnedIp(url) {
|
|
76
81
|
return __awaiter(this, void 0, void 0, function* () {
|
|
77
82
|
const parsed = parseUrl(url);
|
|
78
|
-
|
|
83
|
+
const addresses = yield (0, blacklist_1.resolveAddress)(parsed.hostname);
|
|
84
|
+
if (addresses.length === 0) {
|
|
79
85
|
throw new Error("URL is blocked or could not be resolved safely.");
|
|
80
86
|
}
|
|
87
|
+
for (const address of addresses) {
|
|
88
|
+
if (yield (0, blacklist_1.isBlacklisted)(address)) {
|
|
89
|
+
throw new Error("URL is blocked or could not be resolved safely.");
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
return addresses[0];
|
|
81
93
|
});
|
|
82
94
|
}
|
|
95
|
+
function makePinnedAgent(url, ip) {
|
|
96
|
+
const protocol = new URL(url).protocol;
|
|
97
|
+
const lookup = (_hostname, _options, callback) => {
|
|
98
|
+
const family = ip.includes(":") ? 6 : 4;
|
|
99
|
+
if (typeof _options === "object" && (_options === null || _options === void 0 ? void 0 : _options.all)) {
|
|
100
|
+
callback(null, [{ address: ip, family }]);
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
callback(null, ip, family);
|
|
104
|
+
};
|
|
105
|
+
return protocol === "https:"
|
|
106
|
+
? new https_1.default.Agent({ lookup })
|
|
107
|
+
: new http_1.default.Agent({ lookup });
|
|
108
|
+
}
|
|
83
109
|
function nextRequestForRedirect(request, responseStatus) {
|
|
84
110
|
var _a;
|
|
85
111
|
const method = ((_a = request.method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || "GET";
|
|
@@ -118,12 +144,23 @@ function releaseResponseBody(response) {
|
|
|
118
144
|
body.resume();
|
|
119
145
|
}
|
|
120
146
|
function fetchWithBlacklist(url_1) {
|
|
121
|
-
return __awaiter(this, arguments, void 0, function* (url, request = {}, { followRedirects = true, fetchFn = node_fetch_1.default, } = {}) {
|
|
147
|
+
return __awaiter(this, arguments, void 0, function* (url, request = {}, { followRedirects = true, returnRedirectWithoutLocation = false, fetchFn = node_fetch_1.default, } = {}) {
|
|
122
148
|
let nextUrl = url;
|
|
123
149
|
let nextRequest = Object.assign(Object.assign({}, request), { redirect: "manual" });
|
|
124
150
|
for (let redirects = 0; redirects <= MAX_REDIRECTS; redirects++) {
|
|
125
|
-
yield
|
|
126
|
-
|
|
151
|
+
const pinnedIp = yield resolveSafePinnedIp(nextUrl);
|
|
152
|
+
let response;
|
|
153
|
+
try {
|
|
154
|
+
response = yield fetchFn(nextUrl, Object.assign(Object.assign({}, nextRequest), { agent: makePinnedAgent(nextUrl, pinnedIp) }));
|
|
155
|
+
}
|
|
156
|
+
catch (error) {
|
|
157
|
+
const hostname = parseUrl(nextUrl).hostname;
|
|
158
|
+
if (error instanceof Error) {
|
|
159
|
+
error.message = `Failed to connect to resolved IP for ${hostname}: ${error.message}`;
|
|
160
|
+
throw error;
|
|
161
|
+
}
|
|
162
|
+
throw new Error(`Failed to connect to resolved IP for ${hostname}: unknown network error`);
|
|
163
|
+
}
|
|
127
164
|
if (!isRedirect(response.status)) {
|
|
128
165
|
return response;
|
|
129
166
|
}
|
|
@@ -136,6 +173,9 @@ function fetchWithBlacklist(url_1) {
|
|
|
136
173
|
}
|
|
137
174
|
const location = response.headers.get("location");
|
|
138
175
|
if (!location) {
|
|
176
|
+
if (returnRedirectWithoutLocation) {
|
|
177
|
+
return response;
|
|
178
|
+
}
|
|
139
179
|
throw new Error("Maximum redirect reached.");
|
|
140
180
|
}
|
|
141
181
|
const redirectUrl = parseUrl(new URL(location, nextUrl).toString()).toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outboundFetch.js","sourceRoot":"","sources":["../../../src/utils/outboundFetch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"outboundFetch.js","sourceRoot":"","sources":["../../../src/utils/outboundFetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getSessionExpirySeconds = getSessionExpirySeconds;
|
|
7
|
+
exports.getSessionExpiryDate = getSessionExpiryDate;
|
|
8
|
+
const Duration_1 = require("./Duration");
|
|
9
|
+
const environment_1 = __importDefault(require("../environment"));
|
|
10
|
+
function getSessionExpirySeconds() {
|
|
11
|
+
const DEFAULT = Duration_1.Duration.fromDays(7).toSeconds();
|
|
12
|
+
if (!environment_1.default.SESSION_EXPIRY_SECONDS) {
|
|
13
|
+
return DEFAULT;
|
|
14
|
+
}
|
|
15
|
+
const parsed = parseInt(environment_1.default.SESSION_EXPIRY_SECONDS);
|
|
16
|
+
return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT;
|
|
17
|
+
}
|
|
18
|
+
function getSessionExpiryDate() {
|
|
19
|
+
return new Date(Date.now() + getSessionExpirySeconds() * 1000);
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=session.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/utils/session.ts"],"names":[],"mappings":";;;;;AAGA,0DAOC;AAED,oDAEC;AAdD,yCAAqC;AACrC,iEAAgC;AAEhC,SAAgB,uBAAuB;IACrC,MAAM,OAAO,GAAG,mBAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;IAChD,IAAI,CAAC,qBAAG,CAAC,sBAAsB,EAAE,CAAC;QAChC,OAAO,OAAO,CAAA;IAChB,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,qBAAG,CAAC,sBAAsB,CAAC,CAAA;IACnD,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAA;AACjE,CAAC;AAED,SAAgB,oBAAoB;IAClC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,uBAAuB,EAAE,GAAG,IAAI,CAAC,CAAA;AAChE,CAAC"}
|
|
@@ -31,7 +31,11 @@ export declare function getCookie<T>(ctx: Ctx, name: string): T | undefined;
|
|
|
31
31
|
export declare function setCookie(ctx: Ctx, value: any, name?: string, opts?: {
|
|
32
32
|
sign: boolean;
|
|
33
33
|
httpOnly?: boolean;
|
|
34
|
+
sameSite?: "lax" | "strict" | "none";
|
|
35
|
+
secure?: boolean;
|
|
36
|
+
expires?: Date;
|
|
34
37
|
}): void;
|
|
38
|
+
export declare function setAuthCookie(ctx: Ctx, value: string): void;
|
|
35
39
|
/**
|
|
36
40
|
* Utility function, simply calls setCookie with an empty string for value
|
|
37
41
|
*/
|