Skip to content
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.

Sign up for GitHub

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

Jump to bottom

1.3.7-rc2 #83

Merged
merged 28 commits into from
Mar 11, 2015
Merged

1.3.7-rc2 #83

merged 28 commits into from
Mar 11, 2015

Conversation

mauricioschneider
Copy link
Contributor

This is mostly a security not just a security update anymore 👊.

Changelog:

- Update node to v0.10.36
- Refactor tasks specs related to chmoding
- Change default login shell of `prey` user to `/bin/false` for linux and `/sbin/nologin` for osx
- Refactor control-panel/interval
- If set in the config file, try proxy is used for all requests made to the panel.

Exploratory QA has been successful in Windows 8.1, Mac OS X Yosemite and the latest GNU/Linux Ubuntu release.

Results of mocha specs:

control-panel/api
screen shot 2015-03-10 at 4 02 40 pm

control-panel/interval
screen shot 2015-03-10 at 3 50 07 pm

agent
screen shot 2015-02-09 at 4 25 56 pm

@mauricioschneider mauricioschneider changed the title 1.3.7 rc2 1.3.7-rc2 Feb 9, 2015
@mauricioschneider
CP: Refactor set_interval and related functions
42ecc29
@mauricioschneider
CP: Interval, fix typo in function name
e1ef81a
@mauricioschneider
Fix #78. Raise volume and unmute in windows.
6bf1e9c
@mauricioschneider
Revert "Fix #78. Raise volume and unmute in windows."
df855e5 
This reverts commit 6bf1e9c.
@mauricioschneider
CP: Move proxy logic from sender to api/request. Add fallback from pr…
d7cb499 
…oxy to no proxy if network down.
@mauricioschneider
Retry without proxy if proxy is set and get temp error.
3aa040d
@mauricioschneider
Check for opts.proxy instead of options.proxy for consistency
c20dd42
@mauricioschneider
Add missing return to retry_without_proxy calls.
5bd79f9
@mauricioschneider
Append try_proxy property to opts when initialising API from conf mod…
bc92c92 
…ule.
@mauricioschneider
Remove unused var from panel conf module.
1deb6e5
@mauricioschneider
Bump needle version to 0.8.1 and update shrinkwrap
c49c60a
@mauricioschneider
Add graceful-fs package required in wipe module.
70f6d7d
@mauricioschneider
Add specs for request. Add retry_timeout as request default option to…
24bf444 
… help speed up testing.
@mauricioschneider
Change request test to use defaults for setting proxy and check for e…
5f60030 
…xact proxy used in each request.
@mauricioschneider
Don't override opts.proxy with default if provided.
c9996e2
@mauricioschneider
Refactor request specs.
560152c
@mauricioschneider
Merge pull request #96 from prey/1.3.7-rc2-prettyproxyfix
f7c7e31 
Use proxy for every request, not only for posting data.
@mauricioschneider
Copy link
Contributor Author

@tomas are we missing something for merging this into master and release v1.3.7?

@tomas
Copy link
Contributor

tomas commented Mar 6, 2015

Apparently not. Is the request/interval change working correctly in plugins/control-panel/interval? Do we have any tests for it?

@mauricioschneider
Copy link
Contributor Author

No, but I'm working on it.

@mauricioschneider
Copy link
Contributor Author

Tests ready for review!

tomas
tomas reviewed Mar 10, 2015
View reviewed changes
lib/agent/plugins/control-panel/interval/index.js
@@ -83,7 +92,10 @@ var unload = function(err) {

hooks.remove('woken', request);
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm thinking that this should go out too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is not being used anywhere?

EDIT: I checked the code. It seems the listener is being added to emitter when loading the adapter in https://github.com/prey/prey-node-client/blob/1.3.7-rc2/lib/agent/plugins/control-panel/index.js#L151. Later, when unloading the interval module, it has to remove the listener since the module won't be available anymore.

Copy link
Contributor

Choose a reason for hiding this comment

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

It's a different thing. The plugin's main controller waits for a 'woken' event from the push adapter (not the hooks module). When that occurs, it calls interval.check(). The 'woken' event from hooks is an old thing -- I think I just forgot to remove it. Actually, I think hooks.trigger('woken') doesn't happen anywhere anymore.

@tomas
Copy link
Contributor

tomas commented Mar 10, 2015

Looks slick. I added two small comments but IMO it's perfectly mergeable. 👍

@mauricioschneider
Copy link
Contributor Author

Here we go!

mauricioschneider added a commit that referenced this pull request Mar 11, 2015
@mauricioschneider
Merge pull request #83 from prey/1.3.7-rc2
3da96ce 
1.3.7-rc2
@mauricioschneider mauricioschneider merged commit 3da96ce into master Mar 11, 2015
@mauricioschneider mauricioschneider deleted the 1.3.7-rc2 branch March 13, 2015 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mauricioschneider @tomas