azure__walinuxagent-547

{
  "status": "ok",
  "filepath": "azurelinuxagent/common/version.py",
  "content": "\n    # The platform.py lib has issue with detecting oracle linux distribution.\n    # Merge the following patch provided by oracle as a temporary fix.\n    if os.path.exists(\"/etc/oracle-release\"):\n        osinfo[2] = \"oracle\"\n        osinfo[3] = \"Oracle Linux\"\n\n    # The platform.py lib has issue with detecting BIG-IP linux distribution.\n    # Merge the following patch provided by F5.\n    if os.path.exists(\"/shared/vadc\"):\n        osinfo = get_f5_platform()\n\n    # Remove trailing whitespace and quote in distro name\n    osinfo[0] = osinfo[0].strip('\"').strip(' ').lower()\n    return osinfo\n\n\nAGENT_NAME = \"WALinuxAgent\"\nAGENT_LONG_NAME = \"Azure Linux Agent\"\nAGENT_VERSION = '2.2.2'\nAGENT_LONG_VERSION = \"{0}-{1}\".format(AGENT_NAME, AGENT_VERSION)\nAGENT_DESCRIPTION = \"\"\"\\\nThe Azure Linux Agent supports the provisioning and running of Linux\nVMs in the Azure cloud. This package should be installed on Linux disk\nimages that are built to run in the Azure environment.\n\"\"\"\n\nAGENT_DIR_GLOB = \"{0}-*\".format(AGENT_NAME)\nAGENT_PKG_GLOB = \"{0}-*.zip\".format(AGENT_NAME)\n\nAGENT_PATTERN = \"{0}-(.*)\".format(AGENT_NAME)",
  "start_line": 70,
  "end_line": 100,
  "total_lines": 172,
  "is_truncated": false
}

{
  "status": "ok",
  "filepath": "azurelinuxagent/common/version.py",
  "content": "AGENT_NAME_PATTERN = re.compile(AGENT_PATTERN)\nAGENT_DIR_PATTERN = re.compile(\".*/{0}\".format(AGENT_PATTERN))\n\nEXT_HANDLER_PATTERN = b\".*/WALinuxAgent-(\\w.\\w.\\w[.\\w]*)-.*-run-exthandlers\"\nEXT_HANDLER_REGEX = re.compile(EXT_HANDLER_PATTERN)\n\n# Set the CURRENT_AGENT and CURRENT_VERSION to match the agent directory name\n# - This ensures the agent will \"see itself\" using the same name and version\n#   as the code that downloads agents.\ndef set_current_agent():\n    path = os.getcwd()\n    lib_dir = conf.get_lib_dir()\n    if lib_dir[-1] != os.path.sep:\n        lib_dir += os.path.sep\n    if path[:len(lib_dir)] != lib_dir:\n        agent = AGENT_LONG_VERSION\n        version = AGENT_VERSION\n    else:\n        agent = path[len(lib_dir):].split(os.path.sep)[0]\n        version = AGENT_NAME_PATTERN.match(agent).group(1)\n    return agent, FlexibleVersion(version)\nCURRENT_AGENT, CURRENT_VERSION = set_current_agent()\n\ndef set_goal_state_agent():\n    agent = None\n    pids = [pid for pid in os.listdir('/proc') if pid.isdigit()]\n    for pid in pids:\n        try:\n            pname = open(os.path.join('/proc', pid, 'cmdline'), 'rb').read()\n            match = EXT_HANDLER_REGEX.match(pname)\n            if match:\n                agent = match.group(1)\n                break\n        except IOError:\n            continue\n    if agent is None:\n        agent = CURRENT_VERSION\n    return agent\nGOAL_STATE_AGENT_VERSION = set_goal_state_agent()\n\ndef is_current_agent_installed():\n    return CURRENT_AGENT == AGENT_LONG_VERSION\n\n\n__distro__ = get_distro()\nDISTRO_NAME = __distro__[0]\nDISTRO_VERSION = __distro__[1]\nDISTRO_CODE_NAME = __distro__[2]\nDISTRO_FULL_NAME = __distro__[3]\n\nPY_VERSION = sys.version_info\nPY_VERSION_MAJOR = sys.version_info[0]\nPY_VERSION_MINOR = sys.version_info[1]\nPY_VERSION_MICRO = sys.version_info[2]\n\n\"\"\"\nAdd this workaround for detecting Snappy Ubuntu Core temporarily, until ubuntu\nfixed this bug: https://bugs.launchpad.net/snappy/+bug/1481086\n\"\"\"\n\n\ndef is_snappy():\n    if os.path.exists(\"/etc/motd\"):\n        motd = fileutil.read_file(\"/etc/motd\")\n        if \"snappy\" in motd:\n            return True\n    return False\n\n\nif is_snappy():\n    DISTRO_FULL_NAME = \"Snappy Ubuntu Core\"\n",
  "start_line": 101,
  "end_line": 172,
  "total_lines": 172,
  "is_truncated": false
}

{
  "status": "ok",
  "filepath": "azurelinuxagent/common/conf.py",
  "content": "# Microsoft Azure Linux Agent\n#\n# Copyright 2014 Microsoft Corporation\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n#\n# Requires Python 2.4+ and Openssl 1.0+\n#\n\n\"\"\"\nModule conf loads and parses configuration file\n\"\"\"\nimport os\nimport azurelinuxagent.common.utils.fileutil as fileutil\nfrom azurelinuxagent.common.exception import AgentConfigError\n\n\nclass ConfigurationProvider(object):\n    \"\"\"\n    Parse amd store key:values in /etc/waagent.conf.\n    \"\"\"\n\n    def __init__(self):\n        self.values = dict()\n\n    def load(self, content):\n        if not content:\n            raise AgentConfigError(\"Can't not parse empty configuration\")\n        for line in content.split('\\n'):\n            if not line.startswith(\"#\") and \"=\" in line:\n                parts = line.split()[0].split('=')\n                value = parts[1].strip(\"\\\" \")\n                if value != \"None\":\n                    self.values[parts[0]] = value\n                else:\n                    self.values[parts[0]] = None\n\n    def get(self, key, default_val):\n        val = self.values.get(key)\n        return val if val is not None else default_val\n\n    def get_switch(self, key, default_val):\n        val = self.values.get(key)\n        if val is not None and val.lower() == 'y':\n            return True\n        elif val is not None and val.lower() == 'n':\n            return False\n        return default_val\n\n    def get_int(self, key, default_val):\n        try:\n            return int(self.values.get(key))\n        except TypeError:\n            return default_val\n        except ValueError:\n            return default_val\n\n\n__conf__ = ConfigurationProvider()\n\n\ndef load_conf_from_file(conf_file_path, conf=__conf__):\n    \"\"\"\n    Load conf file from: conf_file_path\n    \"\"\"\n    if os.path.isfile(conf_file_path) == False:\n        raise AgentConfigError((\"Missing configuration in {0}\"\n                                \"\").format(conf_file_path))\n    try:\n        content = fileutil.read_file(conf_file_path)\n        conf.load(content)\n    except IOError as err:\n        raise AgentConfigError((\"Failed to load conf file:{0}, {1}\"\n                                \"\").format(conf_file_path, err))\n\n\ndef enable_rdma(conf=__conf__):\n    return conf.get_switch(\"OS.EnableRDMA\", False) or \\\n           conf.get_switch(\"OS.UpdateRdmaDriver\", False) or \\\n           conf.get_switch(\"OS.CheckRdmaDriver\", False)\n\n\ndef get_logs_verbose(conf=__conf__):\n    return conf.get_switch(\"Logs.Verbose\", False)\n\n\ndef get_lib_dir(conf=__conf__):\n    return conf.get(\"Lib.Dir\", \"/var/lib/waagent\")\n\n\ndef get_published_hostname(conf=__conf__):\n    return os.path.join(get_lib_dir(conf), 'published_hostname')\n\n\ndef get_dvd_mount_point(conf=__conf__):\n    return conf.get(\"DVD.MountPoint\", \"/mnt/cdrom/secure\")\n\n\ndef get_agent_pid_file_path(conf=__conf__):\n    return conf.get(\"Pid.File\", \"/var/run/waagent.pid\")\n\n\ndef get_ext_log_dir(conf=__conf__):\n    return conf.get(\"Extension.LogDir\", \"/var/log/azure\")\n\n\ndef get_openssl_cmd(conf=__conf__):\n    return conf.get(\"OS.OpensslPath\", \"/usr/bin/openssl\")\n\n\ndef get_home_dir(conf=__conf__):\n    return conf.get(\"OS.HomeDir\", \"/home\")\n\n\ndef get_passwd_file_path(conf=__conf__):\n    return conf.get(\"OS.PasswordPath\", \"/etc/shadow\")\n\n\ndef get_sudoers_dir(conf=__conf__):\n    return conf.get(\"OS.SudoersDir\", \"/etc/sudoers.d\")\n\n\ndef get_sshd_conf_file_path(conf=__conf__):\n    return conf.get(\"OS.SshdConfigPath\", \"/etc/ssh/sshd_config\")\n\n\ndef get_root_device_scsi_timeout(conf=__conf__):\n    return conf.get(\"OS.RootDeviceScsiTimeout\", None)\n\n\ndef get_ssh_host_keypair_type(conf=__conf__):\n    return conf.get(\"Provisioning.SshHostKeyPairType\", \"rsa\")\n\n\ndef get_provision_enabled(conf=__conf__):\n    return conf.get_switch(\"Provisioning.Enabled\", True)\n\n\ndef get_allow_reset_sys_user(conf=__conf__):\n    return conf.get_switch(\"Provisioning.AllowResetSysUser\", False)",
  "start_line": 1,
  "end_line": 150,
  "total_lines": 229,
  "is_truncated": true
}

{
  "status": "ok",
  "stdout": "Test 1: CWD is /tmp, lib_dir is /var/lib/waagent\n('WALinuxAgent-2.2.2', 2.2.2)\nSuccess\n\nTest 2: CWD is /var/lib/waagent/WALinuxAgent-2.2.2, lib_dir is /var/lib/waagent\n('WALinuxAgent-2.2.2', 2.2.2)\nSuccess\n\nTest 3: CWD is /var/lib/waagent/events, lib_dir is /var/lib/waagent\nCaught expected AttributeError: AGENT_NAME_PATTERN.match('events') is None\nFailure: 'NoneType' object has no attribute 'group'\n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "ok",
  "stdout": "Test 1: ('WALinuxAgent-2.2.2', 2.2.2)\nTest 2: ('WALinuxAgent-2.2.2', 2.2.2)\nTest 3: ('WALinuxAgent-2.2.2', 2.2.2)\n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "ok",
  "filepath": "azurelinuxagent/common/version.py",
  "occurrences": 1,
  "strategy": "exact",
  "diff": "--- a/azurelinuxagent/common/version.py\n+++ b/azurelinuxagent/common/version.py\n@@ -117,7 +117,12 @@\n         version = AGENT_VERSION\n     else:\n         agent = path[len(lib_dir):].split(os.path.sep)[0]\n-        version = AGENT_NAME_PATTERN.match(agent).group(1)\n+        match = AGENT_NAME_PATTERN.match(agent)\n+        if match:\n+            version = match.group(1)\n+        else:\n+            agent = AGENT_LONG_VERSION\n+            version = AGENT_VERSION\n     return agent, FlexibleVersion(version)\n CURRENT_AGENT, CURRENT_VERSION = set_current_agent()\n \n",
  "is_truncated": false
}

{
  "status": "ok",
  "stdout": "CURRENT_AGENT: WALinuxAgent-2.2.2\nCURRENT_VERSION: 2.2.2\nSuccess\n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "ok",
  "stdout": "CURRENT_AGENT: WALinuxAgent-2.2.2\nCURRENT_VERSION: 2.2.2\nSuccess\n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "ok",
  "stdout": "CURRENT_AGENT: WALinuxAgent-2.2.2\nCURRENT_VERSION: 2.2.2\nSuccess\n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "ok",
  "stdout": "azurelinuxagent/ga/update.py:46:                                            AGENT_PATTERN, AGENT_NAME_PATTERN, AGENT_DIR_PATTERN, \\\nazurelinuxagent/common/version.py:101:AGENT_NAME_PATTERN = re.compile(AGENT_PATTERN)\nazurelinuxagent/common/version.py:120:        match = AGENT_NAME_PATTERN.match(agent)\n",
  "stderr": "grep: azurelinuxagent/common/__pycache__/version.cpython-37.pyc: binary file matches\n",
  "exit_code": 0
}

{
  "status": "ok",
  "filepath": "azurelinuxagent/ga/update.py",
  "content": "import zipfile\n\nimport azurelinuxagent.common.conf as conf\nimport azurelinuxagent.common.logger as logger\nimport azurelinuxagent.common.utils.fileutil as fileutil\nimport azurelinuxagent.common.utils.restutil as restutil\nimport azurelinuxagent.common.utils.textutil as textutil\n\nfrom azurelinuxagent.common.event import add_event, WALAEventOperation\nfrom azurelinuxagent.common.exception import UpdateError, ProtocolError\nfrom azurelinuxagent.common.future import ustr\nfrom azurelinuxagent.common.osutil import get_osutil\nfrom azurelinuxagent.common.protocol import get_protocol_util\nfrom azurelinuxagent.common.utils.flexible_version import FlexibleVersion\nfrom azurelinuxagent.common.version import AGENT_NAME, AGENT_VERSION, AGENT_LONG_VERSION, \\\n                                            AGENT_DIR_GLOB, AGENT_PKG_GLOB, \\\n                                            AGENT_PATTERN, AGENT_NAME_PATTERN, AGENT_DIR_PATTERN, \\\n                                            CURRENT_AGENT, CURRENT_VERSION, \\\n                                            is_current_agent_installed\n\nfrom azurelinuxagent.ga.exthandlers import HandlerManifest\n\n\nAGENT_ERROR_FILE = \"error.json\" # File name for agent error record\nAGENT_MANIFEST_FILE = \"HandlerManifest.json\"\n\nCHILD_HEALTH_INTERVAL = 15 * 60\nCHILD_LAUNCH_INTERVAL = 5 * 60\nCHILD_LAUNCH_RESTART_MAX = 3\nCHILD_POLL_INTERVAL = 60\n",
  "start_line": 30,
  "end_line": 60,
  "total_lines": 883,
  "is_truncated": false
}

{
  "status": "ok",
  "stdout": "46:                                            AGENT_PATTERN, AGENT_NAME_PATTERN, AGENT_DIR_PATTERN, \\\n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "ok",
  "stdout": " M azurelinuxagent/common/version.py\ndiff --git a/azurelinuxagent/common/version.py b/azurelinuxagent/common/version.py\nindex 1099e25..ac58b50 100644\n--- a/azurelinuxagent/common/version.py\n+++ b/azurelinuxagent/common/version.py\n@@ -117,7 +117,12 @@ def set_current_agent():\n         version = AGENT_VERSION\n     else:\n         agent = path[len(lib_dir):].split(os.path.sep)[0]\n-        version = AGENT_NAME_PATTERN.match(agent).group(1)\n+        match = AGENT_NAME_PATTERN.match(agent)\n+        if match:\n+            version = match.group(1)\n+        else:\n+            agent = AGENT_LONG_VERSION\n+            version = AGENT_VERSION\n     return agent, FlexibleVersion(version)\n CURRENT_AGENT, CURRENT_VERSION = set_current_agent()\n \n",
  "stderr": "",
  "exit_code": 0
}

{
  "status": "ok",
  "patch_size": 700,
  "files_changed": 1
}