Skip to content

Merge master into v1 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 38 commits into from
Jun 22, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
ddee374
validate sarif against schema before uploading
robertbrignull May 15, 2020
ae30190
output a better error message
robertbrignull May 22, 2020
10a2fd6
remove uniqueItems: false
robertbrignull May 22, 2020
8fb9090
fix tests
robertbrignull May 22, 2020
cd1625a
update rubocop version
robertbrignull May 26, 2020
c1add46
Merge branch 'master' into validate_sarif
robertbrignull Jun 8, 2020
c2d2dfd
add instructions
robertbrignull Jun 15, 2020
fcb696e
Merge branch 'master' into validate_sarif
robertbrignull Jun 15, 2020
8a8a49d
Merge pull request #39 from github/validate_sarif
robertbrignull Jun 15, 2020
b97097a
add matrix input to init action
robertbrignull Jun 15, 2020
7e2e297
Remove jest config as tests use Ava now
sampart Jun 15, 2020
87ecd0d
Merge pull request #64 from github/remove-jest-config
sampart Jun 15, 2020
7928587
Update .github/workflows/update-release-branch.yml
robertbrignull Jun 16, 2020
d00417a
Merge branch 'master' into add_dispatch_instructions
robertbrignull Jun 16, 2020
0cdf645
Merge pull request #63 from github/add_dispatch_instructions
robertbrignull Jun 16, 2020
c9d0312
Merge branch 'master' into init_missing_matrix
robertbrignull Jun 16, 2020
6de3e1c
Merge pull request #65 from github/init_missing_matrix
robertbrignull Jun 16, 2020
0b53ebb
Fix config path comparisons where workspace path is a symlink
sampart Jun 16, 2020
013c027
Apply realpathSync sooner
sampart Jun 16, 2020
1aae76b
Configure VSCode to ignore transpiled JavaScript
sampart Jun 17, 2020
fff3de9
wip: hash bundle url and use it as the cache version
Jun 17, 2020
74d434c
fix lint errors
Jun 17, 2020
24096a1
Don't fail if query path doesn't exist
sampart Jun 17, 2020
14d602c
Fix test failures introduced by making code more robust
sampart Jun 17, 2020
dc4009c
Merge pull request #68 from github/ignore-javascript
sampart Jun 17, 2020
14f179f
Merge branch 'master' into dont-fail-on-symlinks
sampart Jun 17, 2020
608ed15
Merge pull request #67 from github/dont-fail-on-symlinks
sampart Jun 18, 2020
4c67491
update @actions/tool-cache, install semver, nock
Jun 18, 2020
3f2a60b
switch to semver instead of hash
Jun 18, 2020
ff8fe44
compiled js
Jun 18, 2020
3ff198f
fix tslint errors
Jun 18, 2020
f9768ac
update deps
Jun 18, 2020
6d036ce
Merge branch 'master' into fix-self-hosted-stale-bundle-download
Jun 18, 2020
11a9af0
update deps again
Jun 18, 2020
5eccb79
improve regex
Jun 19, 2020
34c941d
Use Object.entries() instead of checking hasOwnProperty
Jun 19, 2020
38c2311
build ts
Jun 19, 2020
74f864b
Merge pull request #69 from github/fix-self-hosted-stale-bundle-download
Jun 19, 2020
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
Prev Previous commit
Next Next commit
Apply realpathSync sooner
  • Loading branch information
sampart committed Jun 16, 2020
commit 013c02758e5bcd94cb138d7a62386c20d2b35c8b
6 changes: 3 additions & 3 deletions lib/config-utils.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/config-utils.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/config-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ export class Config {
const localQueryPath = queryUses.slice(2);
// Resolve the local path against the workspace so that when this is
// passed to codeql it resolves to exactly the path we expect it to resolve to.
const workspacePath = util.getRequiredEnvParam('GITHUB_WORKSPACE');
const absoluteQueryPath = path.join(workspacePath, localQueryPath);
const workspacePath = fs.realpathSync(util.getRequiredEnvParam('GITHUB_WORKSPACE'));
const absoluteQueryPath = fs.realpathSync(path.join(workspacePath, localQueryPath));

// Check the file exists
if (!fs.existsSync(absoluteQueryPath)) {
throw new Error(getLocalPathDoesNotExist(configFile, localQueryPath));
}

// Check the local path doesn't jump outside the repo using '..' or symlinks
if (!(fs.realpathSync(absoluteQueryPath) + path.sep).startsWith(fs.realpathSync(workspacePath) + path.sep)) {
if (!(absoluteQueryPath + path.sep).startsWith(workspacePath + path.sep)) {
throw new Error(getLocalPathOutsideOfRepository(configFile, localQueryPath));
}

Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy