From 4a260b66e2eecdab129f00d13b14ab419c8a9024 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@pcbsd.org>
Date: Thu, 28 Jul 2016 16:11:35 -0400
Subject: [PATCH] API CHANGE Add a "groupadd" action to the sysadm/users class.
 This will create a new group on the system REQUIRED: "name" OPTIONAL:
 "gid","users"

REST Request (example):
-------------------------------
PUT /sysadm/users
{
   "action" : "groupadd",
   "name" : "testgroup"
}

WebSocket Request:
-------------------------------
{
   "id" : "fooid",
   "namespace" : "sysadm",
   "args" : {
      "action" : "groupadd",
      "name" : "testgroup"
   },
   "name" : "users"
}

Response:
-------------------------------
{
  "args": {
    "result": "success"
  },
  "id": "fooid",
  "name": "response",
  "namespace": "sysadm"
}
---
 src/server/WebBackend.cpp           |  3 +++
 src/server/library/sysadm-users.cpp | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp
index b22c2de..0280174 100644
--- a/src/server/WebBackend.cpp
+++ b/src/server/WebBackend.cpp
@@ -936,6 +936,9 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmUserRequest(bool allaccess,
   }else if(action=="groupshow"){
     ok = sysadm::UserManager::listGroups(out, (allaccess ? "" : user) );
 
+  }else if(action=="groupadd" && allaccess){
+    ok = sysadm::UserManager::addGroup(out, in_args.toObject() );
+
   }else if(action=="personacrypt_init"){
     qDebug() << "got PC init request:" << in_args << allaccess << user;
     bool go = true;
diff --git a/src/server/library/sysadm-users.cpp b/src/server/library/sysadm-users.cpp
index 2c208e4..bb0518c 100644
--- a/src/server/library/sysadm-users.cpp
+++ b/src/server/library/sysadm-users.cpp
@@ -205,12 +205,26 @@ bool UserManager::listGroups(QJsonObject* out, QString user ){
       out->insert(ginfo[0], obj);
     }
   }
+  if(!ok){ out->insert("error",info.join("\n")); }
   return ok;
 }
 
 bool UserManager::addGroup(QJsonObject* out, QJsonObject input){
   bool ok = false;
-
+  // REQUIRED: "name"
+  // OPTIONAL: "gid", "users"
+  if(input.contains("name")){
+    QStringList args; 
+    args << "groupadd" << "-n" << input.value("name").toString();
+    if(input.contains("gid")){ args << "-g" << input.value("gid").toString(); }
+    if(input.contains("users")){
+      if(input.value("users").isArray()){ args << "-M" << General::JsonArrayToStringList(input.value("users").toArray()).join(","); }
+      else if(input.value("users").isString()){ args << "-M" << input.value("users").toString(); }
+    }
+    QString res = General::RunCommand(ok, "pw", args, "",QStringList() << "MM_CHARSET=UTF-8");
+    if(ok){ out->insert("result","success"); }
+    else{ out->insert("error", res); }
+  }
   return ok;
 }