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

Fix null characters in guest agent stdout. #1991

Open
wants to merge 4 commits into
base: ade-singlepass-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion VMEncryption/main/DiskUtil.py
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ def get_device_items(self, dev_path):
if property_item_pair[0] == 'MODEL':
device_item.model = property_item_pair[1].strip('"')

if property_item_pair[0] == 'MAJ:MIN':
if property_item_pair[0] == 'MAJ:MIN' or property_item_pair[0] == "MAJ_MIN":
device_item.majmin = property_item_pair[1].strip('"')

device_item.device_id = self.get_device_id(self.get_device_path(device_item.name))
Expand Down
4 changes: 0 additions & 4 deletions VMEncryption/main/Utils/HandlerUtil.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,9 @@ def exit_if_same_seq(self, exit_status=None):
sys.exit(0)

def log(self, message):
# write message to stderr for inclusion in QOS telemetry
sys.stderr.write(message)
self._log(self._get_log_prefix() + ': ' + message)

def error(self, message):
# write message to stderr for inclusion in QOS telemetry
sys.stderr.write(message)
self._error(self._get_log_prefix() + ': ' + message)

def _parse_config(self, config_txt):
Expand Down
2 changes: 1 addition & 1 deletion VMEncryption/main/common_parameters.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extension_version": "1.4.0.9",
"extension_version": "1.4.0.16",
"extension_name": "AzureDiskEncryptionForLinux",
"extension_provider_namespace": "Microsoft.Azure.Security"
}
1 change: 0 additions & 1 deletion VMEncryption/main/handle.py
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,6 @@ def enable():
message=msg)
finally:
lock.release_lock()
logger.log("exiting enable lock, PID {0}".format(os.getpid()))

def are_required_devices_encrypted(volume_type, encryption_status, disk_util, bek_util, encryption_operation):
are_data_disk_encrypted = True if encryption_status['data'] == 'Encrypted' else False
Expand Down
2 changes: 1 addition & 1 deletion VMEncryption/main/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.0.9
1.4.0.16