Skip to content
This repository has been archived by the owner on Apr 3, 2024. It is now read-only.

fix: refuse to start if working dir is root dir #381

Merged
merged 9 commits into from
Dec 21, 2017
Merged

fix: refuse to start if working dir is root dir #381

merged 9 commits into from
Dec 21, 2017

Conversation

DominicKramer
Copy link
Contributor

@DominicKramer DominicKramer commented Dec 20, 2017 •
edited
Loading

fixes: #377

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Dec 20, 2017
@ofrobots ofrobots changed the title fix: Refuse to start if working dir is root dir fix: refuse to start if working dir is root dir Dec 20, 2017
ofrobots
ofrobots suggested changes Dec 20, 2017
View reviewed changes
Copy link
Contributor

@ofrobots ofrobots left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commit and PR should include 'Fixes:' metadata.

ofrobots
ofrobots reviewed Dec 20, 2017
View reviewed changes
src/agent/debuglet.ts Outdated
that.emit(
'initError',
new Error(
`Cannot start the agent when the working directory is a root directory`));

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

kjin
kjin reviewed Dec 20, 2017
View reviewed changes
src/agent/debuglet.ts Outdated
// Don't continue if the working directory is a root directory
if (path.join(workingDir, '..') === workingDir) {
that.logger.error(
`Refusing to start with \`workingDirectory\` set to a root directory: '${

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

test/test-debuglet.ts Outdated
@@ -377,6 +377,32 @@ describe('Debuglet', () => {
assert.deepEqual(mergedConfig, compareConfig);
});

it('should not start when workingDirectory is the a directory', (done) => {

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

test/test-debuglet.ts Outdated
@@ -377,6 +377,32 @@ describe('Debuglet', () => {
assert.deepEqual(mergedConfig, compareConfig);
});

it('should not start when workingDirectory is the a directory', (done) => {
const debug = new Debug({}, packageInfo);
const config = extend({}, defaultConfig, {workingDirectory: path.sep});

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

test/test-debuglet.ts Outdated
};

debuglet.on('initError', (err: Error) => {
assert.ok(err);

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@DominicKramer DominicKramer mentioned this pull request Dec 20, 2017
Closed
ofrobots
ofrobots reviewed Dec 20, 2017
View reviewed changes
src/agent/debuglet.ts Outdated
if (!that.config.allowRootAsWorkingDirectory &&
path.join(workingDir, '..') === workingDir) {
const message =
`Refusing to start the cloud debugger with \`workingDirectory\` set to a root ` +

This comment was marked as spam.

Sign in to view

ofrobots
ofrobots approved these changes Dec 20, 2017
View reviewed changes
Copy link
Contributor

@ofrobots ofrobots left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM w/ nit if the CI is happy.

@DominicKramer DominicKramer merged commit 3b97598 into googleapis:master Dec 21, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ofrobots ofrobots ofrobots approved these changes

@kjin kjin kjin approved these changes

Assignees
No one assigned
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

GKE: Error scanning the filesystem
4 participants
@DominicKramer @ofrobots @kjin @googlebot