@netacea/cloudflare 1.6.6 → 1.6.9

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/CHANGELOG.md CHANGED
@@ -3,6 +3,33 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [1.6.9](https://github.com/Netacea/JavascriptATAIntegration/compare/@netacea/cloudflare@1.6.8...@netacea/cloudflare@1.6.9) (2022-08-12)
7
+
8
+ **Note:** Version bump only for package @netacea/cloudflare
9
+
10
+
11
+
12
+
13
+
14
+ ## [1.6.8](https://github.com/Netacea/JavascriptATAIntegration/compare/@netacea/cloudflare@1.6.7...@netacea/cloudflare@1.6.8) (2022-08-08)
15
+
16
+ **Note:** Version bump only for package @netacea/cloudflare
17
+
18
+
19
+
20
+
21
+
22
+ ## [1.6.7](https://github.com/Netacea/JavascriptATAIntegration/compare/@netacea/cloudflare@1.6.6...@netacea/cloudflare@1.6.7) (2022-07-13)
23
+
24
+
25
+ ### Bug Fixes
26
+
27
+ * **Cloudflare:** INT-196: Move Cloudflare Mermaid diagram ([e492274](https://github.com/Netacea/JavascriptATAIntegration/commit/e492274a98d20ef8b67f8e6ee0cbc6f47ddab3f4))
28
+
29
+
30
+
31
+
32
+
6
33
  ## [1.6.6](https://github.com/Netacea/JavascriptATAIntegration/compare/@netacea/cloudflare@1.6.5...@netacea/cloudflare@1.6.6) (2022-07-13)
7
34
 
8
35
 
package/README.md CHANGED
@@ -7,94 +7,9 @@
7
7
 
8
8
  `@netacea/cloudflare` is a package designed to add [Netacea](https://netacea.com) functionality to [Cloudflare Workers](https://workers.cloudflare.com/).
9
9
 
10
- ## Integration graph
11
- ```mermaid
12
- graph TD
13
- subgraph Cloudflare
14
- subgraph Data flow
15
- Request(Request) -->MitigationType{Mitigation<br/> Type}
16
- MitigationType --> |Mitigate| Mitigate[[Get <br/>Mitigation<br/> Response]]
17
- MitigationType --> |Inject| Inject[[Get <br/>Mitigation<br/> Response]]
18
- MitigationType --> |Ingest| Ingest[Get Mitata cookie<br/> from header]
19
- Mitigate --> IsResponseMitigated{Mitigated<br/> Response?}
20
- Inject --> InjectReqHeaders[Add Headers<br/> to request]
21
- Ingest --> IsHashValid{Is hash<br/> valid?}
22
- IsResponseMitigated --> |NO| CallOriginServer[Call origin server]
23
- IsResponseMitigated --> |YES| IsMitigationCaptcha{Mitigation<br/> - captcha?}
24
- IsMitigationCaptcha --> |NO| MitigationCaptchaNo[Response body<br/> - Forbidden]
25
- IsMitigationCaptcha --> |YES| MitigationCaptchaYes[Response body<br/> - mitigation result body]
26
- MitigationCaptchaNo --> NetaceaIngest[Netacea<br/> Ingest]
27
- MitigationCaptchaYes --> NetaceaIngest
28
- InjectReqHeaders --> CallOriginServer
29
- IsHashValid --> |NO| HashValidNo[Create proto Mitata<br/> with no user ID<br/> and max age]
30
- IsHashValid --> |YES| CookieRequireReissue{Does cookie<br/> require reissue?}
31
- CookieRequireReissue --> |NO| CookieRequireReissueNo[Set session status to ''<br/> and setCookie to be<br/> proto Mitata cookie]
32
- CookieRequireReissue --> |YES| CookieRequireReissueYes[Create proto Mitata<br/> with user ID<br/> from Mitata cookie]
33
- HashValidNo --> CallOriginServer
34
- CookieRequireReissueNo --> CallOriginServer
35
- CookieRequireReissueYes --> CallOriginServer
36
- CallOriginServer --> IsNetaceaResultDefined{Is Netacea Result<br/> defined?}
37
- IsNetaceaResultDefined --> |NO| NetaceaIngest
38
- IsNetaceaResultDefined --> |YES| NetaceaResultDefined{New Netacea<br/> cookie<br/> from origin?}
39
- NetaceaResultDefined --> |NO| NetaceaResultDefinedAddCookie[Append cookie<br/> to response]
40
- NetaceaResultDefined --> |YES| NetaceaIngest
41
- NetaceaResultDefinedAddCookie --> NetaceaIngest
42
- NetaceaIngest --> Response(Response)
43
-
44
- subgraph Legend
45
- GreenBorder[Green border means this is shared code <br/>without green borders could still have<br/ some code >in shared areas]
46
- style GreenBorder stroke:#00ce2e, stroke-width:4px
47
- OrangeFilled[[This is a subroutine<br/> which flow you can see<br/> in the diagram on the right]]
48
- style OrangeFilled fill:#d43804, stroke:#000000,stroke-width:3px
49
- end
50
-
51
- style MitigationType stroke:#00ce2e, stroke-width:4px
52
- style Mitigate fill:#d43804, stroke:#000000,stroke-width:3px
53
- style Inject fill:#d43804, stroke:#000000,stroke-width:3px
54
- style Ingest stroke:#00ce2e, stroke-width:4px
55
- style IsHashValid stroke:#00ce2e, stroke-width:4px
56
- style CookieRequireReissue stroke:#00ce2e, stroke-width:4px
57
- style CookieRequireReissueNo stroke:#00ce2e, stroke-width:4px
58
- style CookieRequireReissueYes stroke:#00ce2e, stroke-width:4px
59
- style HashValidNo stroke:#00ce2e, stroke-width:4px
60
- style NetaceaIngest stroke:#00ce2e, stroke-width:4px
61
- end
62
-
63
- subgraph Get Mitigation Response
64
- GetMitigationResponseReq[Request received] --> GetCookies[Get Mitata and<br/> Mitata Captcha<br/> cookie from<br/> requests COOKIE<br/> header]
65
- GetCookies --> IsUrlCaptchaPost{Is URL <br/>catpcha<br/> post?}
66
- IsUrlCaptchaPost --> |Yes| UrlCaptchaPost[Set API key<br/> and client IP headers<br/> on request]
67
- UrlCaptchaPost --> GetMitataFromReqHeader[Get Mitata cookie<br/> from requests<br/> COOKIE header]
68
- GetMitataFromReqHeader --> SetUserID[Set user ID header<br/> to the userId<br/> in Mitata cookie]
69
- SetUserID --> MakeMitSvcReqToVerifyCaptcha[Make mit svc request<br/> to /AtaVerifyCaptcha<br/> endpoint]
70
- IsUrlCaptchaPost --> |No| IsHashOrCookieInvalid{Is hash invalid<br/> OR does cookie<br/> require reissue?}
71
- IsHashOrCookieInvalid --> |No| CreateMitataCookie[Create new Mitata cookie<br/> based on values in old cookie]
72
- IsHashOrCookieInvalid --> |Yes| IsUserIdDefinedInMitata{Is user ID<br/> defined in<br/> Mitata cookie}
73
- IsUserIdDefinedInMitata --> |Yes| AddUserIdToHeader[Add user id to<br/> X-Netacea-UserId<br/> header of mit svc request]
74
- IsUserIdDefinedInMitata --> |No| MakeMitSvcReq[Make mit svc request]
75
- AddUserIdToHeader --> MakeMitSvcReq
76
- MakeMitSvcReq --> CreateMitataCookieFromMitSvcRes[Create Mitata cookie<br/> from mit svc response]
77
- CreateMitataCookieFromMitSvcRes --> CalculateMitigation[Calculate mitigation<br/> from mit svc response]
78
- CreateMitataCookie --> CalculateMitigation
79
- CalculateMitigation --> CreateInjectHeaders[Create inject headers]
80
- CreateInjectHeaders --> GetMitigationResponseRes[Return mit svc response]
81
-
82
- style IsUrlCaptchaPost stroke:#00ce2e, stroke-width:4px
83
- style UrlCaptchaPost stroke:#00ce2e, stroke-width:4px
84
- style GetMitataFromReqHeader stroke:#00ce2e, stroke-width:4px
85
- style SetUserID stroke:#00ce2e, stroke-width:4px
86
- style MakeMitSvcReqToVerifyCaptcha stroke:#00ce2e, stroke-width:4px
87
- style IsHashOrCookieInvalid stroke:#00ce2e, stroke-width:4px
88
- style CreateMitataCookie stroke:#00ce2e, stroke-width:4px
89
- style IsUserIdDefinedInMitata stroke:#00ce2e, stroke-width:4px
90
- style AddUserIdToHeader stroke:#00ce2e, stroke-width:4px
91
- style MakeMitSvcReq stroke:#00ce2e, stroke-width:4px
92
- style CreateMitataCookieFromMitSvcRes stroke:#00ce2e, stroke-width:4px
93
- style CalculateMitigation stroke:#00ce2e, stroke-width:4px
94
- style CreateInjectHeaders stroke:#00ce2e, stroke-width:4px
95
- end
96
- end
97
- ```
10
+ ## Diagrams, Testing & Tooling
11
+
12
+ Additional documentation for cloudflare can be found [here](https://github.com/Netacea/JavascriptATAIntegration/blob/main/docs/integrations/CLOUDFLARE.md) in the docs folder
98
13
 
99
14
  ## Installation
100
15
 
@@ -102,8 +17,24 @@ graph TD
102
17
 
103
18
  We strongly recommend installing and using [wrangler](https://github.com/cloudflare/wrangler) to manage your cloudflare workers. Wrangler is a CLI tool designed to make previewing and deploying Cloudflare Workers seamless.
104
19
 
20
+ If you need to use root via wsl and are installing wrangler, you may need to run the following set of commands for a error-free install
21
+ `sudo chmod 777 ~/root`
22
+ `npm install -g @cloudflare/wrangler`
23
+ `sudo chmod 700 ~/root`
24
+ `sudo chmod -R 700 ~/root/.wrangler`
25
+
26
+ Check you have wrangler by using
27
+ `wrangler --help`
28
+
105
29
  #### 🌻 Starting fresh
106
30
 
31
+ If you use ssh for git, you will need to open `~/.gitconfig` and comment out the following lines while using `wrangler generate`
32
+ ```
33
+ [url "ssh://git@github.com/"]
34
+ insteadOf = https://github.com
35
+ ```
36
+ otherwise wrangler will fail to clone the project when using `wrangler generate`.
37
+
107
38
  After installing wrangler, you can pull the Netacea worker template by running the following:
108
39
 
109
40
  ```bash
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@netacea/cloudflare",
3
- "version": "1.6.6",
3
+ "version": "1.6.9",
4
4
  "description": "Netacea Cloudflare CDN Integration",
5
5
  "main": "dist/src/index.js",
6
6
  "types": "dist/src/index.d.ts",
@@ -16,7 +16,7 @@
16
16
  "license": "ISC",
17
17
  "dependencies": {
18
18
  "@netacea/netaceaintegrationbase": "^1.10.3",
19
- "@netacea/netaceaintegrationtestrunner": "^1.5.5"
19
+ "@netacea/netaceaintegrationtestrunner": "^1.5.6"
20
20
  },
21
21
  "devDependencies": {
22
22
  "@cloudflare/workers-types": "^2.0.0",
@@ -32,5 +32,5 @@
32
32
  "tsconfig-paths": "^3.9.0",
33
33
  "typescript": "^3.9.7"
34
34
  },
35
- "gitHead": "9c24424966a5b9ca9a64b996d687917b6b39642a"
35
+ "gitHead": "ead56d17211d03e6863a4cf000adbec84fcd8f45"
36
36
  }
@@ -56,11 +56,15 @@ class Cloudflare extends netaceaintegrationbase_1.default {
56
56
  };
57
57
  }
58
58
  async ingest(request, response) {
59
- var _a, _b, _c;
59
+ var _a, _b, _c, _d;
60
60
  const setCookie = this.getHeaderValueOrDefault(response.headers, 'set-cookie');
61
61
  const cookieString = setCookie !== '' ? setCookie : this.getHeaderValueOrDefault(request.headers, 'cookie');
62
- const mitata = (_a = this.readCookie('_mitata', cookieString)) !== null && _a !== void 0 ? _a : '';
63
- const { match, mitigate, captcha } = (_b = netaceaintegrationbase_1.matchMitataCookie(mitata)) !== null && _b !== void 0 ? _b : {
62
+ let mitata = (_a = this.readCookie('_mitata', cookieString)) !== null && _a !== void 0 ? _a : '';
63
+ if (mitata === undefined || mitata === '') {
64
+ const cookieString = this.getHeaderValueOrDefault(request.headers, 'cookie');
65
+ mitata = (_b = this.readCookie('_mitata', cookieString)) !== null && _b !== void 0 ? _b : '';
66
+ }
67
+ const { match, mitigate, captcha } = (_c = netaceaintegrationbase_1.matchMitataCookie(mitata)) !== null && _c !== void 0 ? _c : {
64
68
  match: 0,
65
69
  mitigate: 0,
66
70
  captcha: 0
@@ -71,7 +75,7 @@ class Cloudflare extends netaceaintegrationbase_1.default {
71
75
  ip: this.getHeaderValueOrDefault(request.headers, 'cf-connecting-ip', ''),
72
76
  method: request.method,
73
77
  path: new URL(request.url).pathname,
74
- protocol: ((_c = request.cf) !== null && _c !== void 0 ? _c : {}).httpProtocol,
78
+ protocol: ((_d = request.cf) !== null && _d !== void 0 ? _d : {}).httpProtocol,
75
79
  referer: this.getHeaderValueOrDefault(request.headers, 'referer', ''),
76
80
  requestTime: '0',
77
81
  sessionStatus,
@@ -1 +1 @@
1
- {"version":3,"file":"Cloudflare.js","sourceRoot":"","sources":["../../src/Cloudflare.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Cloudflare.js","sourceRoot":"","sources":["../../src/Cloudflare.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@netacea/cloudflare",
3
- "version": "1.6.6",
3
+ "version": "1.6.9",
4
4
  "description": "Netacea Cloudflare CDN Integration",
5
5
  "main": "dist/src/index.js",
6
6
  "types": "dist/src/index.d.ts",
@@ -16,7 +16,7 @@
16
16
  "license": "ISC",
17
17
  "dependencies": {
18
18
  "@netacea/netaceaintegrationbase": "^1.10.3",
19
- "@netacea/netaceaintegrationtestrunner": "^1.5.5"
19
+ "@netacea/netaceaintegrationtestrunner": "^1.5.6"
20
20
  },
21
21
  "devDependencies": {
22
22
  "@cloudflare/workers-types": "^2.0.0",
@@ -32,5 +32,5 @@
32
32
  "tsconfig-paths": "^3.9.0",
33
33
  "typescript": "^3.9.7"
34
34
  },
35
- "gitHead": "9c24424966a5b9ca9a64b996d687917b6b39642a"
35
+ "gitHead": "ead56d17211d03e6863a4cf000adbec84fcd8f45"
36
36
  }