@ossiana/node-libcurl 1.0.9-alpha-1 → 1.0.9-alpha-3

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.
Files changed (4) hide show
  1. package/dist/utils.js +15 -2
  2. package/dist/utils.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/utils.ts +17 -2
package/dist/utils.js CHANGED
@@ -18,16 +18,29 @@ const httpCookiesToArray = (cookies) => {
18
18
  continue;
19
19
  }
20
20
  const [domain, secure, path, cors, timestamp, name, value] = it.split('\t');
21
- cookies_.push([domain, stringBooleanToJsBoolean(secure), path, stringBooleanToJsBoolean(cors), parseInt(timestamp), name, value]);
21
+ cookies_.push([domain.replace(/#HttpOnly_/i, ''), stringBooleanToJsBoolean(secure), path, stringBooleanToJsBoolean(cors), parseInt(timestamp), name, value]);
22
22
  }
23
23
  return cookies_;
24
24
  };
25
25
  exports.httpCookiesToArray = httpCookiesToArray;
26
+ const getSubdomains = (domain) => {
27
+ const subdomains = domain.split('.');
28
+ const subdomainList = [];
29
+ for (let i = 0; i < subdomains.length - 1; i++) {
30
+ const domain_ = subdomains.slice(i).join('.');
31
+ subdomainList.push(domain_);
32
+ if (!domain_.startsWith('.')) {
33
+ subdomainList.push(`.${domain_}`);
34
+ }
35
+ }
36
+ return subdomainList;
37
+ };
26
38
  const cookieOptFilter = (cookieOpt) => {
27
39
  return (e) => {
28
40
  if (cookieOpt) {
29
41
  if (cookieOpt.domain) {
30
- if (cookieOpt.domain != e[0])
42
+ const domainArr = getSubdomains(cookieOpt.domain);
43
+ if (!domainArr.find(t => e[0]))
31
44
  return false;
32
45
  }
33
46
  if (cookieOpt.path) {
package/dist/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAEO,MAAM,kBAAkB,GAAkD,CAAC,OAAO,EAAE,EAAE;IACzF,MAAM,wBAAwB,GAAG,CAAC,CAAS,EAAE,EAAE;QAC3C,QAAQ,CAAC,EAAE;YACP,KAAK,MAAM;gBACP,OAAO,IAAI,CAAC;YAChB,KAAK,OAAO;gBACR,OAAO,KAAK,CAAC;YACjB;gBACI,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;SAC1C;IACL,CAAC,CAAA;IAMD,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAClC,IAAI,CAAC,EAAE,EAAE;YACL,SAAS;SACZ;QACD,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5E,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,wBAAwB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,wBAAwB,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;KACpI;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAA;AAzBY,QAAA,kBAAkB,sBAyB9B;AAEM,MAAM,eAAe,GAAG,CAAC,SAAkC,EAAE,EAAE;IAClE,OAAO,CAAC,CAAyB,EAAE,EAAE;QACjC,IAAI,SAAS,EAAE;YACX,IAAI,SAAS,CAAC,MAAM,EAAE;gBAClB,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;oBACxB,OAAO,KAAK,CAAC;aACpB;YACD,IAAI,SAAS,CAAC,IAAI,EAAE;gBAChB,IAAI,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;oBACtB,OAAO,KAAK,CAAC;aACpB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAA;AACL,CAAC,CAAA;AAdY,QAAA,eAAe,mBAc3B;AAGM,MAAM,iBAAiB,GAAG,CAAC,IAAa,EAAE,OAA2B,EAAE,MAAc,EAAE,EAAE;IAC5F,IAAI,OAAO,OAAO,IAAI,QAAQ,EAAE;QAC5B,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;aACtB,KAAK,CAAC,GAAG,CAAC;aACV,OAAO,EAAE;aACT,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;aACzB,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACtB,IAAI,CAAC,SAAS,CAAC;gBACX,IAAI,EAAE,GAAG;gBACT,KAAK;gBACL,MAAM;gBACN,IAAI,EAAE,GAAG;aACZ,CAAC,CAAA;QACN,CAAC,CAAC,CAAC;KACV;SAAM;QACH,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC/B,IAAI,CAAC,SAAS,CAAC;gBACX,IAAI,EAAE,GAAG;gBACT,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC;gBACnB,MAAM;gBACN,IAAI,EAAE,GAAG;aACZ,CAAC,CAAC;QACP,CAAC,CAAC,CAAA;KACL;AACL,CAAC,CAAA;AAxBY,QAAA,iBAAiB,qBAwB7B"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ossiana/node-libcurl",
3
- "version": "1.0.9-alpha-1",
3
+ "version": "1.0.9-alpha-3",
4
4
  "dependencies": {
5
5
  "@mapbox/node-pre-gyp": "^1.0.10",
6
6
  "bindings": "^1.5.0",
package/src/utils.ts CHANGED
@@ -22,16 +22,31 @@ export const httpCookiesToArray: (cookies: string) => LibCurlCookieAttrArray[] =
22
22
  continue;
23
23
  }
24
24
  const [domain, secure, path, cors, timestamp, name, value] = it.split('\t');
25
- cookies_.push([domain, stringBooleanToJsBoolean(secure), path, stringBooleanToJsBoolean(cors), parseInt(timestamp), name, value])
25
+ cookies_.push([domain.replace(/#HttpOnly_/i, ''), stringBooleanToJsBoolean(secure), path, stringBooleanToJsBoolean(cors), parseInt(timestamp), name, value])
26
26
  }
27
27
  return cookies_;
28
28
  }
29
29
 
30
+ const getSubdomains = (domain: string) => {
31
+ const subdomains = domain.split('.');
32
+ const subdomainList = [];
33
+
34
+ for (let i = 0; i < subdomains.length - 1; i++) {
35
+ const domain_ = subdomains.slice(i).join('.');
36
+ subdomainList.push(domain_);
37
+ if (!domain_.startsWith('.')) {
38
+ subdomainList.push(`.${domain_}`);
39
+ }
40
+ }
41
+ return subdomainList;
42
+ }
43
+
30
44
  export const cookieOptFilter = (cookieOpt: LibCurlGetCookiesOption) => {
31
45
  return (e: LibCurlCookieAttrArray) => {
32
46
  if (cookieOpt) {
33
47
  if (cookieOpt.domain) {
34
- if (cookieOpt.domain != e[0])
48
+ const domainArr = getSubdomains(cookieOpt.domain);
49
+ if (!domainArr.find(t => e[0]))
35
50
  return false;
36
51
  }
37
52
  if (cookieOpt.path) {