From 5a53aacf9f43a4e20108810c31cc5f6ddddc32d9 Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Fri, 29 Jan 2016 15:37:43 -0500 Subject: [PATCH] Add new API call to get all iocage default settings REST Request: ------------------------------- PUT /sysadm/iocage { "action" : "getdefaultsettings" } REST Response: ------------------------------- { "args": { "getdefaultsettings": { "defaults": { "allow_chflags": "0", "allow_mount": "0", "allow_mount_devfs": "0", "allow_mount_nullfs": "0", "allow_mount_procfs": "0", "allow_mount_tmpfs": "0", "allow_mount_zfs": "0", "allow_quotas": "0", "allow_raw_sockets": "0", "allow_set_hostname": "1", "allow_socket_af": "0", "allow_sysvipc": "0", "available": "426G", "boot": "off", "bpf": "off", "children_max": "0", "compression": "lz4", "compressratio": "1.00x", "coredumpsize": "off", "count": "1", "cpuset": "off", "cputime": "off", "datasize": "off", "dedup": "off", "defaultrouter": "none", "defaultrouter6": "none", "devfs_ruleset": "4", "dhcp": "off", "enforce_statfs": "2", "exec_clean": "1", "exec_fib": "0", "exec_jail_user": "root", "exec_poststart": "/usr/bin/true", "exec_poststop": "/usr/bin/true", "exec_prestart": "/usr/bin/true", "exec_prestop": "/usr/bin/true", "exec_start": "/bin/sh /etc/rc", "exec_stop": "/bin/sh /etc/rc.shutdown", "exec_system_jail_user": "0", "exec_system_user": "root", "exec_timeout": "60", "ftpfiles": "base.txz doc.txz lib32.txz src.txz", "ftphost": "ftp.freebsd.org", "gitlocation": "https://github.com", "hack88": "0", "host_domainname": "none", "host_hostname": "442a5843-c6bd-11e5-bbe9-fcaa14deb15d", "host_hostuuid": "442a5843-c6bd-11e5-bbe9-fcaa14deb15d", "hostid": "4145fbb8-c5b6-11e5-9f2f-fcaa14deb15d", "interfaces": "vnet0:bridge0,vnet1:bridge1", "ip4": "new", "ip4_addr": "none", "ip4_autoend": "none", "ip4_autostart": "none", "ip4_autosubnet": "none", "ip4_saddrsel": "1", "ip6": "new", "ip6_addr": "none", "ip6_saddrsel": "1", "istemplate": "no", "jail_zfs": "off", "jail_zfs_dataset": "iocage/jails/442a5843-c6bd-11e5-bbe9-fcaa14deb15d/data", "jail_zfs_mountpoint": "none", "last_started": "none", "login_flags": "-f root", "maxproc": "off", "memorylocked": "off", "memoryuse": "8G:log", "mount_devfs": "1", "mount_fdescfs": "1", "mount_linprocfs": "0", "mount_procfs": "0", "mountpoint": "/iocage/.defaults", "msgqqueued": "off", "msgqsize": "off", "nmsgq": "off", "notes": "none", "nsemop": "off", "nshm": "off", "nthr": "off", "openfiles": "off", "origin": "-", "owner": "root", "pcpu": "off", "pkglist": "none", "priority": "99", "pseudoterminals": "off", "quota": "none", "release": "11.0-CURRENTJAN2016", "reservation": "none", "resolver": "none", "rlimits": "off", "securelevel": "2", "shmsize": "off", "stacksize": "off", "stop_timeout": "30", "swapuse": "off", "sync_target": "none", "sync_tgt_zpool": "none", "tag": "2016-01-29@14:19:49", "type": "basejail", "used": "96K", "vmemoryuse": "off", "vnet": "off", "vnet0_mac": "none", "vnet1_mac": "none", "vnet2_mac": "none", "vnet3_mac": "none", "wallclock": "off" } } } } WebSocket Request: ------------------------------- { "args" : { "action" : "getdefaultsettings" }, "id" : "fooid", "name" : "iocage", "namespace" : "sysadm" } WebSocket Response: ------------------------------- { "args": { "getdefaultsettings": { "defaults": { "allow_chflags": "0", "allow_mount": "0", "allow_mount_devfs": "0", "allow_mount_nullfs": "0", "allow_mount_procfs": "0", "allow_mount_tmpfs": "0", "allow_mount_zfs": "0", "allow_quotas": "0", "allow_raw_sockets": "0", "allow_set_hostname": "1", "allow_socket_af": "0", "allow_sysvipc": "0", "available": "426G", "boot": "off", "bpf": "off", "children_max": "0", "compression": "lz4", "compressratio": "1.00x", "coredumpsize": "off", "count": "1", "cpuset": "off", "cputime": "off", "datasize": "off", "dedup": "off", "defaultrouter": "none", "defaultrouter6": "none", "devfs_ruleset": "4", "dhcp": "off", "enforce_statfs": "2", "exec_clean": "1", "exec_fib": "0", "exec_jail_user": "root", "exec_poststart": "/usr/bin/true", "exec_poststop": "/usr/bin/true", "exec_prestart": "/usr/bin/true", "exec_prestop": "/usr/bin/true", "exec_start": "/bin/sh /etc/rc", "exec_stop": "/bin/sh /etc/rc.shutdown", "exec_system_jail_user": "0", "exec_system_user": "root", "exec_timeout": "60", "ftpfiles": "base.txz doc.txz lib32.txz src.txz", "ftphost": "ftp.freebsd.org", "gitlocation": "https://github.com", "hack88": "0", "host_domainname": "none", "host_hostname": "442a5843-c6bd-11e5-bbe9-fcaa14deb15d", "host_hostuuid": "442a5843-c6bd-11e5-bbe9-fcaa14deb15d", "hostid": "4145fbb8-c5b6-11e5-9f2f-fcaa14deb15d", "interfaces": "vnet0:bridge0,vnet1:bridge1", "ip4": "new", "ip4_addr": "none", "ip4_autoend": "none", "ip4_autostart": "none", "ip4_autosubnet": "none", "ip4_saddrsel": "1", "ip6": "new", "ip6_addr": "none", "ip6_saddrsel": "1", "istemplate": "no", "jail_zfs": "off", "jail_zfs_dataset": "iocage/jails/442a5843-c6bd-11e5-bbe9-fcaa14deb15d/data", "jail_zfs_mountpoint": "none", "last_started": "none", "login_flags": "-f root", "maxproc": "off", "memorylocked": "off", "memoryuse": "8G:log", "mount_devfs": "1", "mount_fdescfs": "1", "mount_linprocfs": "0", "mount_procfs": "0", "mountpoint": "/iocage/.defaults", "msgqqueued": "off", "msgqsize": "off", "nmsgq": "off", "notes": "none", "nsemop": "off", "nshm": "off", "nthr": "off", "openfiles": "off", "origin": "-", "owner": "root", "pcpu": "off", "pkglist": "none", "priority": "99", "pseudoterminals": "off", "quota": "none", "release": "11.0-CURRENTJAN2016", "reservation": "none", "resolver": "none", "rlimits": "off", "securelevel": "2", "shmsize": "off", "stacksize": "off", "stop_timeout": "30", "swapuse": "off", "sync_target": "none", "sync_tgt_zpool": "none", "tag": "2016-01-29@14:19:49", "type": "basejail", "used": "96K", "vmemoryuse": "off", "vnet": "off", "vnet0_mac": "none", "vnet1_mac": "none", "vnet2_mac": "none", "vnet3_mac": "none", "wallclock": "off" } } }, "id": "fooid", "name": "response", "namespace": "sysadm" } --- src/library/sysadm-iocage.cpp | 24 ++++++++++++++++++++++++ src/library/sysadm-iocage.h | 1 + src/server/WebBackend.cpp | 4 ++++ 3 files changed, 29 insertions(+) diff --git a/src/library/sysadm-iocage.cpp b/src/library/sysadm-iocage.cpp index 5c6a35d..393282b 100644 --- a/src/library/sysadm-iocage.cpp +++ b/src/library/sysadm-iocage.cpp @@ -11,6 +11,30 @@ using namespace sysadm; //PLEASE: Keep the functions in the same order as listed in pcbsd-general.h +// Return all the default iocage settings +QJsonObject Iocage::getDefaultSettings() { + QJsonObject retObject; + + QStringList output = General::RunCommand("iocage defaults").split("\n"); + + QJsonObject vals; + for ( int i = 0; i < output.size(); i++) + { + if ( output.at(i).indexOf("JID") != -1 ) + continue; + + if ( output.at(i).isEmpty() ) + break; + + QString key = output.at(i).simplified().section("=", 0, 0); + QString value = output.at(i).simplified().section("=", 1, 1); + + vals.insert(key, value); + } + + retObject.insert("defaults", vals); + return retObject; +} // List the jails on the box QJsonObject Iocage::getJailSettings(QJsonObject jsin) { diff --git a/src/library/sysadm-iocage.h b/src/library/sysadm-iocage.h index d23a444..3a1f9f7 100644 --- a/src/library/sysadm-iocage.h +++ b/src/library/sysadm-iocage.h @@ -14,6 +14,7 @@ namespace sysadm{ class Iocage{ public: + static QJsonObject getDefaultSettings(); static QJsonObject getJailSettings(QJsonObject); static QJsonObject listJails(); }; diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp index 26d331b..dea1650 100644 --- a/src/server/WebBackend.cpp +++ b/src/server/WebBackend.cpp @@ -343,6 +343,10 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmIocageRequest(const QJsonVal bool ok = false; if(keys.contains("action")){ QString act = JsonValueToString(in_args.toObject().value("action")); + if(act=="getdefaultsettings"){ + ok = true; + out->insert("getdefaultsettings", sysadm::Iocage::getDefaultSettings()); + } if(act=="getjailsettings"){ ok = true; out->insert("getjailsettings", sysadm::Iocage::getJailSettings(in_args.toObject()));