Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions integration-tests/js-compute/fixtures/app/src/cache-override.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,24 @@ import { isRunningLocally, routes } from './routes.js';
`CacheOverride constructor: 'mode' has to be "none", "pass", or "override", but got "be nice to the cache"`,
);
});
routes.set('/cache-override/constructor/negative-ttl', async () => {
assertThrows(
() => {
new CacheOverride('override', { ttl: -1 });
},
TypeError,
`CacheOverride: ttl must be a non-negative integer`,
);
});
routes.set('/cache-override/constructor/negative-swr', async () => {
assertThrows(
() => {
new CacheOverride('override', { swr: -1 });
},
TypeError,
`CacheOverride: swr must be a non-negative integer`,
);
});
routes.set('/cache-override/constructor/valid-mode', async () => {
assertDoesNotThrow(() => {
new CacheOverride('none');
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/js-compute/fixtures/app/tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
"GET /cache-override/constructor/invalid-mode": {
"flake": true
},
"GET /cache-override/constructor/negative-ttl": {},
"GET /cache-override/constructor/negative-swr": {},
"GET /cache-override/constructor/valid-mode": {},
"GET /cache-override/fetch/mode-none": {},
"GET /cache-override/fetch/mode-pass": {
Expand Down
10 changes: 8 additions & 2 deletions runtime/fastly/builtins/cache-override.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,10 @@ bool CacheOverride::ttl_set(JSContext *cx, JS::HandleObject self, JS::HandleValu
int32_t ttl;
if (!JS::ToInt32(cx, val, &ttl))
return false;

if (ttl < 0) {
return api::throw_error(cx, api::Errors::TypeError, "CacheOverride", "ttl",
"be a non-negative integer");
}
set_ttl(self, ttl);
}
rval.set(ttl(self));
Expand Down Expand Up @@ -262,7 +265,10 @@ bool CacheOverride::swr_set(JSContext *cx, JS::HandleObject self, JS::HandleValu
int32_t swr;
if (!JS::ToInt32(cx, val, &swr))
return false;

if (swr < 0) {
return api::throw_error(cx, api::Errors::TypeError, "CacheOverride", "swr",
"be a non-negative integer");
}
set_swr(self, swr);
}
rval.set(swr(self));
Expand Down
Loading