Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cs-au-dk/jelly
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: coana-tech/jelly
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
2 contributors
Loading
Showing with 620 additions and 382 deletions.
  1. +4 −3 package.json
  2. +1 −1 src/analysis/globalstate.ts
  3. +1 −1 src/analysis/operations.ts
  4. +541 −364 src/main.ts
  5. +7 −1 src/options.ts
  6. +23 −3 src/patternmatching/vulnerabilitydetector.ts
  7. +22 −9 src/server.ts
  8. +9 −0 src/typings/ipc.ts
  9. +12 −0 src/util.ts
7 changes: 4 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -28,17 +28,18 @@
"jelly-server": "lib/server.js"
},
"scripts": {
"build": "npm run chmod; tsc --build tsconfig-build.json",
"build": "(npm run chmod || echo 0) && tsc --build tsconfig-build.json",
"build-watch": "npm run chmod; tsc --build tsconfig-build.json -w",
"start": "node lib/main.js",
"chmod": "mkdir -p lib; touch lib/main.js lib/server.js; chmod +x lib/main.js lib/server.js",
"chmod": "mkdir -p lib ; touch lib/main.js lib/server.js ; chmod +x lib/main.js lib/server.js",
"tests-install": "tests/install.sh",
"test": "jest --selectProjects default",
"differential": "jest --selectProjects differential",
"pkg": "npm run clean; npm run build; pkg lib/main.js -C Brotli --options \"expose-gc,max-old-space-size=8192\" -c package.json -o dist/jelly; pkg lib/server.js -C Brotli --options \"expose-gc,max-old-space-size=8192\" -c package.json -o dist/jelly-server",
"clean": "rm -rf lib dist tmp/tsbuildinfo tmp/coverage tests/node_modules/jelly-previous",
"build-docker": "npm run build && docker build -t jelly .",
"jelly-docker": "./bin/jelly-docker"
"jelly-docker": "./bin/jelly-docker",
"prepare": "npm run build"
},
"dependencies": {
"@babel/core": "^7.24.8",
2 changes: 1 addition & 1 deletion src/analysis/globalstate.ts
View file
Original file line number Diff line number Diff line change
@@ -153,7 +153,7 @@ export class GlobalState {
numberOfCanonicalizeAccessPathCalls = 0;

/**
* Vulnerability information, only used if options.vulnerabilities is set.
* Vulnerability information, only used if options.vulnerabilities or options.vulnerabilitiesJSON is set.
*/
vulnerabilities: VulnerabilityDetector | undefined; // TODO: move to FragmentState?

2 changes: 1 addition & 1 deletion src/analysis/operations.ts
View file
Original file line number Diff line number Diff line change
@@ -735,7 +735,7 @@ export class Operations {

// add access path token
const analyzed = m instanceof ModuleInfo && m.isIncluded;
if (!analyzed || options.vulnerabilities) {
if (!analyzed || options.vulnerabilities || options.vulnerabilitiesJSON) {
const s = normalizeModuleName(str);
const tracked = options.trackedModules && options.trackedModules.find(e =>
micromatch.isMatch(m!.getOfficialName(), e) || micromatch.isMatch(s, e));
Loading