Fixed VM name validation in GUI tools (Create VM, Settings, Manager) (R3.2) #112
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VM name validation in various places in Manager did not allow perfectly legal otherwise '_' and '.' characters. references QubesOS/qubes-issues#2422 fixes QubesOS/qubes-issues#3301
marmarek
requested changes
Jul 14, 2018
qubesmanager/create_new_vm.py
Outdated
| @@ -74,7 +74,7 @@ def __init__(self, app, qvm_collection, trayIcon, parent = None): | |||
| self.fill_template_list() | |||
| self.fill_netvm_list() | |||
|
|
|||
| self.vmname.setValidator(QRegExpValidator(QRegExp("[a-zA-Z0-9-]*", Qt.CaseInsensitive), None)) | |||
| self.vmname.setValidator(QRegExpValidator(QRegExp("[a-zA-Z0-9_-.]*", Qt.CaseInsensitive), None)) | |||
There was a problem hiding this comment.
- needs to be the last character in set ([]), otherwise it means a characters range.
qubesmanager/main.py
Outdated
| @@ -368,7 +368,7 @@ def __init__(self, qvm_collection, blk_manager, parent=None): | |||
| self.blk_watch_thread.start() | |||
|
|
|||
| self.searchbox = SearchBox() | |||
| self.searchbox.setValidator(QRegExpValidator(QRegExp("[a-zA-Z0-9-]*", Qt.CaseInsensitive), None)) | |||
| self.searchbox.setValidator(QRegExpValidator(QRegExp("[a-zA-Z0-9_-.]*", Qt.CaseInsensitive), None)) | |||
qubesmanager/settings.py
Outdated
| @@ -206,7 +206,7 @@ def current_tab_changed(self, idx): | |||
|
|
|||
| def __init_basic_tab__(self): | |||
| self.vmname.setText(self.vm.name) | |||
| self.vmname.setValidator(QRegExpValidator(QRegExp("[a-zA-Z0-9-]*", Qt.CaseInsensitive), None)) | |||
| self.vmname.setValidator(QRegExpValidator(QRegExp("[a-zA-Z0-9_-.]*", Qt.CaseInsensitive), None)) | |||
As per @marmarek's request.
marmarek
approved these changes
Jul 17, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
VM name validation in various places in Manager did not allow
perfectly legal otherwise '_' and '.' characters.
references QubesOS/qubes-issues#2422
fixes QubesOS/qubes-issues#3301