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.

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

Feature/check for updates #309

Merged
merged 10 commits into from
May 12, 2019
Merged

Conversation

itaymmguardicore
Copy link
Contributor

Feature / Fixes

Add check for update feature for monkey island

  • Have you added an explanation of what your changes do and why you'd like to include them?
  • Have you successfully tested your changes locally?

"server_config": "standard"
"server_config": "standard",
"deployment": "develop",
"monkey_version": "1.6.2"
Copy link
Contributor

Choose a reason for hiding this comment

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

Add newline at end of file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

if res is False:
return res

[int(x) for x in res.split('.')] # raises value error if version is invalid format
Copy link
Contributor

Choose a reason for hiding this comment

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

We can't return new dev version this way? we're forced to return int.int.int.int...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No such thing as "new dev version"

super(VersionUpdate, self).__init__()

@jwt_required()
def get(self):
Copy link
Contributor

@danielguardicore danielguardicore Apr 23, 2019

Choose a reason for hiding this comment

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

I don't think this should be jwt_required

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

Add new line at end of server_config.json
@@ -13,6 +13,7 @@ class Environment(object):
_MONGO_URL = os.environ.get("MONKEY_MONGO_URL", "mongodb://localhost:27017/monkeyisland")
_DEBUG_SERVER = False
_AUTH_EXPIRATION_TIME = timedelta(hours=1)
_MONKEY_VERSION = "1.6.2"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is it hardcoded here?

add requests to requirements
# Conflicts:
#	monkey/monkey_island/cc/app.py
#	monkey/monkey_island/requirements.txt
@itaymmguardicore itaymmguardicore merged commit ca096d9 into develop May 12, 2019
@itaymmguardicore itaymmguardicore deleted the feature/check-for-updates branch May 12, 2019 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants