Breaking/change btool to rest

solnlib/credentials.py

@@ -373,7 +373,7 @@ def get_session_key(
     validate_scheme_host_port(scheme, host, port)
 
     if any([scheme is None, host is None, port is None]):
-        scheme, host, port = get_splunkd_access_info()
+        scheme, host, port = get_splunkd_access_info(use_btool=True)
 
     uri = "{scheme}://{host}:{port}/{endpoint}".format(
         scheme=scheme, host=host, port=port, endpoint="services/auth/login"

solnlib/modular_input/event_writer.py

@@ -233,13 +233,15 @@ def __init__(
             scheme, host, hec_port = utils.extract_http_scheme_host_port(hec_uri)
         else:
             if not all([scheme, host, port]):
-                scheme, host, port = get_splunkd_access_info()
+                scheme, host, port = get_splunkd_access_info(
+                    session_key=self._session_key
+                )
             hec_port, hec_token = self._get_hec_config(
                 hec_input_name, session_key, scheme, host, port, **context
             )
 
         if global_settings_schema:
-            scheme = get_scheme_from_hec_settings()
+            scheme = get_scheme_from_hec_settings(session_key=self._session_key)
 
         if not context.get("pool_connections"):
             context["pool_connections"] = 10

solnlib/server_info.py

@@ -78,7 +78,7 @@ def __init__(
         """
         is_localhost = False
         if not all([scheme, host, port]) and os.environ.get("SPLUNK_HOME"):
-            scheme, host, port = get_splunkd_access_info()
+            scheme, host, port = get_splunkd_access_info(session_key=session_key)
             is_localhost = (
                 host == "localhost" or host == "127.0.0.1" or host in ("::1", "[::1]")
             )

solnlib/splunk_rest_client.py

@@ -221,7 +221,7 @@ def __init__(
         """
         # Only do splunkd URI discovery in SPLUNK env (SPLUNK_HOME is set).
         if not all([scheme, host, port]) and os.environ.get("SPLUNK_HOME"):
-            scheme, host, port = get_splunkd_access_info()
+            scheme, host, port = get_splunkd_access_info(session_key=session_key)
         if os.environ.get("SPLUNK_HOME") is None:
             if not all([scheme, host, port]):
                 raise ValueError(

solnlib/splunkenv.py

@@ -20,10 +20,15 @@
 import os.path as op
 import socket
 import subprocess
+import json
 from configparser import ConfigParser
 from io import StringIO
 from typing import List, Optional, Tuple, Union
 
+from splunk.clilib.bundle_paths import make_splunkhome_path as msp
+from splunk.rest import simpleRequest
+from splunk import getSessionKey
+
 from .utils import is_true
 
 __all__ = [
@@ -36,6 +41,7 @@
     "get_conf_key_value",
     "get_conf_stanza",
     "get_conf_stanzas",
+    "_get_conf_stanzas_from_splunk_api",
 ]
 
 ETC_LEAF = "etc"
@@ -54,46 +60,6 @@
 ]
 
 
-def _splunk_home():
-    return os.path.normpath(os.environ["SPLUNK_HOME"])
-
-
-def _splunk_etc():
-    try:
-        result = os.environ["SPLUNK_ETC"]
-    except KeyError:
-        result = op.join(_splunk_home(), ETC_LEAF)
-
-    return os.path.normpath(result)
-
-
-def _get_shared_storage() -> Optional[str]:
-    """Get splunk shared storage name.
-
-    Returns:
-        Splunk shared storage name.
-    """
-
-    try:
-        state = get_conf_key_value("server", "pooling", "state", APP_SYSTEM)
-        storage = get_conf_key_value("server", "pooling", "storage", APP_SYSTEM)
-    except KeyError:
-        state = "disabled"
-        storage = None
-
-    if state == "enabled" and storage:
-        return storage
-
-    return None
-
-
-# Verify path prefix and return true if both paths have drives
-def _verify_path_prefix(path, start):
-    path_drive = os.path.splitdrive(path)[0]
-    start_drive = os.path.splitdrive(start)[0]
-    return len(path_drive) == len(start_drive)
-
-
 def make_splunkhome_path(parts: Union[List, Tuple]) -> str:
     """Construct absolute path by $SPLUNK_HOME and `parts`.
 
@@ -111,53 +77,28 @@ def make_splunkhome_path(parts: Union[List, Tuple]) -> str:
     Raises:
         ValueError: Escape from intended parent directories.
     """
+    return msp(parts)
 
-    relpath = os.path.normpath(os.path.join(*parts))
-
-    basepath = None
-    shared_storage = _get_shared_storage()
-    if shared_storage:
-        for candidate in on_shared_storage:
-            # SPL-100508 On windows if the path is missing the drive letter,
-            # construct fullpath manually and call relpath
-            if os.name == "nt" and not _verify_path_prefix(relpath, candidate):
-                break
-
-            if os.path.relpath(relpath, candidate)[0:2] != "..":
-                basepath = shared_storage
-                break
-
-    if basepath is None:
-        etc_with_trailing_sep = os.path.join(ETC_LEAF, "")
-        if relpath == ETC_LEAF or relpath.startswith(etc_with_trailing_sep):
-            # Redirect $SPLUNK_HOME/etc to $SPLUNK_ETC.
-            basepath = _splunk_etc()
-            # Remove leading etc (and path separator, if present). Note: when
-            # emitting $SPLUNK_ETC exactly, with no additional path parts, we
-            # set <relpath> to the empty string.
-            relpath = relpath[4:]
-        else:
-            basepath = _splunk_home()
-
-    fullpath = os.path.normpath(os.path.join(basepath, relpath))
-
-    # Check that we haven't escaped from intended parent directories.
-    if os.path.relpath(fullpath, basepath)[0:2] == "..":
-        raise ValueError(
-            f'Illegal escape from parent directory "{basepath}": {fullpath}'
-        )
-    return fullpath
 
-
-def get_splunk_host_info() -> Tuple:
+def get_splunk_host_info(
+    use_btool: Optional[bool] = False, session_key: Optional[str] = None
+) -> Tuple:
     """Get splunk host info.
 
     Returns:
         Tuple of (server_name, host_name).
     """
 
-    server_name = get_conf_key_value("server", "general", "serverName", APP_SYSTEM)
+    server_name = get_conf_key_value(
+        "server",
+        "general",
+        "serverName",
+        use_btool=use_btool,
+        session_key=session_key,
+        app_name=APP_SYSTEM,
+    )
     host_name = socket.gethostname()
+
     return server_name, host_name
 
 
@@ -175,21 +116,36 @@ def get_splunk_bin() -> str:
     return make_splunkhome_path(("bin", splunk_bin))
 
 
-def get_splunkd_access_info() -> Tuple[str, str, int]:
+def get_splunkd_access_info(
+    use_btool: Optional[bool] = False, session_key: Optional[str] = None
+) -> Tuple[str, str, int]:
     """Get splunkd server access info.
 
     Returns:
         Tuple of (scheme, host, port).
     """
+    enable_splunkd_ssl = get_conf_key_value(
+        "server",
+        "sslConfig",
+        "enableSplunkdSSL",
+        use_btool=use_btool,
+        session_key=session_key,
+        app_name=APP_SYSTEM,
+    )
 
-    if is_true(
-        get_conf_key_value("server", "sslConfig", "enableSplunkdSSL", APP_SYSTEM)
-    ):
+    if is_true(enable_splunkd_ssl):
         scheme = "https"
     else:
         scheme = "http"
 
-    host_port = get_conf_key_value("web", "settings", "mgmtHostPort", APP_SYSTEM)
+    host_port = get_conf_key_value(
+        "web",
+        "settings",
+        "mgmtHostPort",
+        use_btool=use_btool,
+        session_key=session_key,
+        app_name=APP_SYSTEM,
+    )
     host_port = host_port.strip()
     host_port_split_parts = host_port.split(":")
     host = ":".join(host_port_split_parts[:-1])
@@ -203,14 +159,23 @@ def get_splunkd_access_info() -> Tuple[str, str, int]:
     return scheme, host, port
 
 
-def get_scheme_from_hec_settings() -> str:
+def get_scheme_from_hec_settings(
+    use_btool: Optional[bool] = False, session_key: Optional[str] = None
+) -> str:
     """Get scheme from HEC global settings.
 
     Returns:
         scheme (str)
     """
     try:
-        ssl_enabled = get_conf_key_value("inputs", "http", "enableSSL", APP_HEC)
+        ssl_enabled = get_conf_key_value(
+            "inputs",
+            "http",
+            "enableSSL",
+            use_btool=use_btool,
+            session_key=session_key,
+            app_name=APP_HEC,
+        )
     except KeyError:
         raise KeyError(
             "Cannot get enableSSL setting form conf: 'inputs' and stanza: '[http]'. "
@@ -237,20 +202,29 @@ def get_splunkd_uri() -> str:
     if os.environ.get("SPLUNKD_URI"):
         return os.environ["SPLUNKD_URI"]
 
-    scheme, host, port = get_splunkd_access_info()
+    scheme, host, port = get_splunkd_access_info(use_btool=True)
     return f"{scheme}://{host}:{port}"
 
 
 def get_conf_key_value(
-    conf_name: str, stanza: str, key: str, app_name: Optional[str] = None
+    conf_name: str,
+    stanza: str,
+    key: str,
+    use_btool: Optional[bool] = False,
+    app_name: Optional[str] = None,
+    session_key: Optional[str] = None,
+    user: Optional[str] = "nobody",
 ) -> Union[str, List, dict]:
     """Get value of `key` of `stanza` in `conf_name`.
 
     Arguments:
         conf_name: Config file.
         stanza: Stanza name.
         key: Key name.
+        use_btool: If True, stanzas will be retrieved using cmd btool... otherwise using splunk API. Optional.
         app_name: Application name. Optional.
+        session_key: If not provided solnlib will try to get it from splunk.getSessionKey(). Optional.
+        user: used for set user context in API call. Optional.
 
     Returns:
         Config value.
@@ -259,18 +233,39 @@ def get_conf_key_value(
         KeyError: If `stanza` or `key` doesn't exist.
     """
 
-    stanzas = get_conf_stanzas(conf_name, app_name)
-    return stanzas[stanza][key]
+    if use_btool:
+        stanzas = get_conf_stanzas(conf_name, app_name)
+        return stanzas[stanza][key]
+
+    if not app_name:
+        raise KeyError("app name must be specified if use_btool is True")
+
+    stanzas = _get_conf_stanzas_from_splunk_api(
+        conf_name, app_name, session_key=session_key, user=user, stanza=stanza
+    )
+
+    stanza = stanzas.get("entry")[0].get("content")
+    requested_key = stanza[key]
+    return requested_key
 
 
 def get_conf_stanza(
-    conf_name: str, stanza: str, app_name: Optional[str] = None
+    conf_name: str,
+    stanza: str,
+    use_btool: Optional[bool] = False,
+    app_name: Optional[str] = None,
+    session_key: Optional[str] = None,
+    user: Optional[str] = "nobody",
 ) -> dict:
     """Get `stanza` in `conf_name`.
 
     Arguments:
         conf_name: Config file.
         stanza: Stanza name.
+        use_btool: If True, stanzas will be retrieved using cmd btool... otherwise using splunk API. Optional.
+        app_name: Application name. Optional.
+        session_key: If not provided solnlib will try to get it from splunk.getSessionKey(). Optional.
+        user: used for set user context in API call. Optional.
         app_name: Application name. Optional.
 
     Returns:
@@ -280,8 +275,19 @@ def get_conf_stanza(
          KeyError: If stanza doesn't exist.
     """
 
-    stanzas = get_conf_stanzas(conf_name, app_name)
-    return stanzas[stanza]
+    if use_btool:
+        stanzas = get_conf_stanzas(conf_name, app_name)
+        return stanzas[stanza]  # uncomment after tests
+
+    if not app_name:
+        raise KeyError("app name must be specified if use_btool is True")
+
+    stanzas = _get_conf_stanzas_from_splunk_api(
+        conf_name, app_name, session_key=session_key, user=user, stanza=stanza
+    )
+
+    stanza = stanzas.get("entry")[0].get("content")
+    return stanza
 
 
 def get_conf_stanzas(conf_name: str, app_name: Optional[str] = None) -> dict:
@@ -330,3 +336,42 @@ def get_conf_stanzas(conf_name: str, app_name: Optional[str] = None) -> dict:
     for section in parser.sections():
         out[section] = {item[0]: item[1] for item in parser.items(section, raw=True)}
     return out
+
+
+def _get_conf_stanzas_from_splunk_api(
+    conf_name: str,
+    app_name: str,
+    session_key: Optional[str] = None,
+    user: Optional[str] = "nobody",
+    stanza: Optional[str] = None,
+) -> dict:
+    """Get stanzas of `conf_name` using splunk API:
+
+    /servicesNS/{user}/{app_name}/configs/conf-{conf_name}/{stanza}
+
+    Arguments:
+        conf_name: Config file.
+        app_name: Application name.
+        session_key: Session key. Optional.
+        user: Username. Optional.
+        stanza: Stanza name. Optional.
+
+    Returns:
+        json response.
+    """
+
+    url = f"/servicesNS/{user}/{app_name}/configs/conf-{conf_name}"
+
+    if stanza:
+        url = url + "/" + stanza
+
+    if not session_key:
+        session_key = getSessionKey()
+
+    server_response, server_content = simpleRequest(
+        url, sessionKey=session_key, getargs={"output_mode": "json"}, logme=True
+    )
+
+    result = json.loads(server_content.decode())
+
+    return result