Unified eDBadminGetCertificateInfo(), eDBadminAddCertificate() and eDBadminDeleteCertificate() into eDBadminCertificate()

Updated eurephiadm utility to make use of this new unified API

2 files changed, 84 insertions, 33 deletions

diff --git a/eurephiadm/commands/certificates.c b/eurephiadm/commands/certificates.c
index 287b2a8..32c8b52 100644
--- a/eurephiadm/commands/certificates.c
+++ b/eurephiadm/commands/certificates.c
@@ -167,15 +167,17 @@ int help_Certificates2(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *
 int register_certificate(eurephiaCTX *ctx, int depth, const char *digest,
                   const char *cname, const char *org, const char *email)
 {
-        xmlDoc *cert_xml = NULL;
+        xmlDoc *cert_xml = NULL, *res_xml = NULL;
         xmlNode *cert_n = NULL;
+        eurephiaRESULT *res = NULL;
         char tmp[66], *cname_cp = NULL, *org_cp = NULL;
         int certid = 0;
 
         assert( ctx != NULL );
 
-        eurephiaXML_CreateDoc(ctx, 1, "register_certificate", &cert_xml, &cert_n);
+        eurephiaXML_CreateDoc(ctx, 1, "certificates", &cert_xml, &cert_n);
         assert( (cert_xml != NULL) || (cert_n != NULL) );
+        xmlNewProp(cert_n, (xmlChar *) "mode", (xmlChar *) "register");
 
         cert_n = xmlNewChild(cert_n, NULL, (xmlChar *) "fieldMapping", NULL);
         xmlNewProp(cert_n, (xmlChar *) "table", (xmlChar *) "certificates");
@@ -193,11 +195,29 @@ int register_certificate(eurephiaCTX *ctx, int depth, const char *digest,
         xmlNewChild(cert_n, NULL, (xmlChar *) "email", (xmlChar *) email);
 
         // Register the certificate
-        certid = eDBadminAddCertificate(ctx, cert_xml);
-        if( certid > 0 ) {
-                fprintf(stdout, "%s: Certificate registered successfully (certid %i)\n", MODULE, certid);
-        } else {
+        res_xml = eDBadminCertificate(ctx, cert_xml);
+        if( res_xml == NULL ) {
                 fprintf(stderr, "%s: Failed to register certificate\n", MODULE);
+        } else {
+                res = eurephiaXML_ParseResultMsg(ctx, res_xml);
+                if( res == NULL ) {
+                        fprintf(stderr, "%s: Failed to register certificate. No results available\n", MODULE);
+                        certid = 0;
+                } else if( res->resultType == exmlRESULT ) {
+                        cert_n = xmlFindNode(res->details, "certificate");
+                        if( cert_n == NULL ) {
+                                fprintf(stderr, "%s: Did not receive certificate ID of the newly registered"
+                                        " certificate\n", MODULE);
+                                certid = 0;
+                        } else {
+                                certid = atoi_nullsafe(xmlGetAttrValue(cert_n->properties, "certid"));
+                                fprintf(stdout, "%s: %s\n", MODULE, res->message);
+                        }
+                } else {
+                        fprintf(stderr, "%s: %s\n", MODULE, res->message);
+                        certid = 0;
+                }
+                free_nullsafe(ctx, res);
         }
         xmlFreeDoc(cert_xml);
         free_nullsafe(ctx, cname_cp);
@@ -374,8 +394,9 @@ int add_cert(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int a
  * @return returns 0 on success, otherwise 1.
  */
 int delete_cert(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int argc, char **argv) {
-        xmlDoc *cert_xml = NULL, *delete_xml = NULL, *certlist = NULL;
+        xmlDoc *cert_xml = NULL, *delete_xml = NULL, *certlist = NULL, *res_xml = NULL;
         xmlNode *cert_n = NULL, *search_n = NULL, *delete_n = NULL;
+        eurephiaRESULT *res = NULL;
         char *digest = NULL, *cname = NULL, *org = NULL, *email = NULL, *certid = NULL, confirm[5];
         const char *xsltparams[] = {"view_digest", "'1'", "firewall", "'0'", NULL};
         int i, rc = 0, count = 0;
@@ -431,7 +452,11 @@ int delete_cert(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, in
         }
 
         // Create a field mapping containing our search criteria(s)
-        eurephiaXML_CreateDoc(ctx, 1, "certificate_info", &cert_xml, &cert_n);
+        eurephiaXML_CreateDoc(ctx, 1, "certificates", &cert_xml, &cert_n);
+        assert( (cert_xml != NULL) && (cert_n != NULL));
+        xmlNewProp(cert_n, (xmlChar *) "mode", (xmlChar *) "list");
+        xmlNewChild(cert_n, NULL, (xmlChar *) "sortkeys", (xmlChar *) "certid");
+
         search_n = xmlNewChild(cert_n, NULL, (xmlChar *) "fieldMapping", NULL);
         xmlNewProp(search_n, (xmlChar *) "table", (xmlChar *) "certificates");
 
@@ -452,7 +477,7 @@ int delete_cert(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, in
         }
 
         // Look up the certificate info and display it
-        certlist = eDBadminGetCertificateInfo(ctx, cert_xml, "certid");
+        certlist = eDBadminCertificate(ctx, cert_xml);
         if( certlist == NULL ) {
                 return 0;
         }
@@ -477,15 +502,29 @@ int delete_cert(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, in
         }
 
         // If user accepts to delete certificate(s), do so
-        eurephiaXML_CreateDoc(ctx, 1, "delete_certificate", &delete_xml, &delete_n);
+        eurephiaXML_CreateDoc(ctx, 1, "certificates", &delete_xml, &delete_n);
+        assert( (delete_xml != NULL) && (delete_n != NULL));
+        xmlNewProp(delete_n, (xmlChar *) "mode", (xmlChar *) "delete");
         xmlAddChild(delete_n, xmlCopyNode(search_n, 1));
 
-        if( eDBadminDeleteCertificate(ctx, delete_xml) == 1 ) {
-                printf("%s: Certificate%s deleted successfully\n", MODULE, (count != 1 ? "s" : ""));
-                rc = 0;
-        } else {
+        res_xml = eDBadminCertificate(ctx, delete_xml);
+        if(  res_xml == NULL ) {
                 fprintf(stderr, "%s: Failed to delete the certificate%s\n", MODULE, (count != 1 ? "s" : ""));
                 rc = 1;
+        } else {
+                res = eurephiaXML_ParseResultMsg(ctx, res_xml);
+                if( res == NULL ) {
+                        fprintf(stderr, "%s: Failed to delete the certificate%s\n", MODULE,
+                                (count != 1 ? "s" : ""));
+                        rc = 1;
+                } else if( res->resultType == exmlERROR ) {
+                        fprintf(stderr, "%s: %s\n", MODULE, res->message);
+                        rc = 1;
+                } else {
+                        fprintf(stdout, "%s: %s\n", MODULE, res->message);
+                        rc = 0;
+                }
+                free_nullsafe(ctx, res);
         }
         xmlFreeDoc(delete_xml);
 
@@ -544,12 +583,19 @@ int list_certs(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int
         }
 
         // Create an empty field mapping to get all certificates
-        eurephiaXML_CreateDoc(ctx, 1, "certificate_info", &srch_xml, &srch_n);
+        eurephiaXML_CreateDoc(ctx, 1, "certificates", &srch_xml, &srch_n);
+        assert( (srch_xml != NULL) && (srch_n != NULL));
+        xmlNewProp(srch_n, (xmlChar *) "mode", (xmlChar *) "list");
+        xmlNewChild(srch_n, NULL, (xmlChar *) "sortkeys", (xmlChar *) sortkeys);
+
         srch_n = xmlNewChild(srch_n, NULL, (xmlChar *) "fieldMapping", NULL);
         xmlNewProp(srch_n, (xmlChar *) "table", (xmlChar *) "certificates");
 
+        xmlSaveFormatFileEnc("-", srch_xml, "UTF-8", 1);
+
+
         // Look up the certificate info and display it
-        certlist = eDBadminGetCertificateInfo(ctx, srch_xml, sortkeys);
+        certlist = eDBadminCertificate(ctx, srch_xml);
         if( certlist == NULL ) {
                 xmlFreeDoc(srch_xml);
                 fprintf(stderr, "%s: Failed to query for certificates\n", MODULE);
@@ -557,7 +603,7 @@ int list_certs(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int
         }
 
         cert_n = eurephiaXML_getRoot(ctx, certlist, "certificates", 1);
-        if( atoi_nullsafe(xmlGetAttrValue(cert_n->properties, "certificates")) == 0 ) {
+        if( (cert_n == NULL) || atoi_nullsafe(xmlGetAttrValue(cert_n->properties, "certificates")) == 0 ) {
                 printf("%s: No certificates found\n", MODULE);
                 rc = 0;
                 goto exit;
diff --git a/eurephiadm/commands/users.c b/eurephiadm/commands/users.c
index 18d8101..e314dfe 100644
--- a/eurephiadm/commands/users.c
+++ b/eurephiadm/commands/users.c
@@ -611,24 +611,24 @@ int account_activation(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *
                 xmlNewProp(update_n, (xmlChar *) "table", (xmlChar *) "usercerts");
                 xmlNewChild(update_n, NULL, (xmlChar *) "uid", (xmlChar *) uid_str);
 
-		tmp_xml = eDBadminUserCertsLink(ctx, update_xml);
+                tmp_xml = eDBadminUserCertsLink(ctx, update_xml);
                 if( tmp_xml == NULL ) {
                         fprintf(stderr, "%s: Failed to remove the user-certs link\n", MODULE);
                 }
 
-		res = eurephiaXML_ParseResultMsg(ctx, tmp_xml);
+                res = eurephiaXML_ParseResultMsg(ctx, tmp_xml);
                 if( res == NULL ) {
-			fprintf(stderr, "%s: Failed to remove user <-> certificate link.  "
+                        fprintf(stderr, "%s: Failed to remove user <-> certificate link.  "
                                 "No results received\n", MODULE);
                         rc = 0;
                 } else {
                         if( res->resultType == exmlERROR ) {
                                 fprintf(stderr, "%s: %s\n", MODULE, res->message);
                         };
-			rc = 1;
+                        rc = 1;
                         free_nullsafe(ctx, res);
-		}
-		xmlFreeDoc(tmp_xml);
+                }
+                xmlFreeDoc(tmp_xml);
                 break;
         }
 
@@ -725,7 +725,7 @@ int add_user(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int a
                         certfile_format = CERTFILE_PKCS12;
                         break;
 
-                case 'd':
+                case 'D':
                         if( strlen_nullsafe(optargs[0]) < 59 ) {
                                 fprintf(stderr, "%s: Certificate digest is too short\n", MODULE);
                                 return 1;
@@ -811,12 +811,16 @@ int add_user(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int a
                         int certcount = 0;
 
                         // when we have certificate digest, look that up
-                        eurephiaXML_CreateDoc(ctx, 1, "certificate_info", &cert_xml, &cert_n);
+                        eurephiaXML_CreateDoc(ctx, 1, "certificates", &cert_xml, &cert_n);
+                        assert( (cert_xml != NULL) && (cert_n != NULL) );
+                        xmlNewProp(cert_n, (xmlChar *) "mode", (xmlChar *) "list");
+                        xmlNewChild(cert_n, NULL, (xmlChar *) "sortkeys", (xmlChar *) "certid");
+
                         cert_n = xmlNewChild(cert_n, NULL, (xmlChar *) "fieldMapping", NULL);
                         xmlNewProp(cert_n, (xmlChar *) "table", (xmlChar *) "certificates");
                         xmlNewChild(cert_n, NULL, (xmlChar *) "digest", (xmlChar *) digest);
 
-                        certlist = eDBadminGetCertificateInfo(ctx, cert_xml, "certid");
+                        certlist = eDBadminCertificate(ctx, cert_xml);
                         if( certlist == NULL ) {
                                 fprintf(stderr, "%s: Error while looking up certificate info.\n"
                                         "%s: User account is not associated with any certificates\n",
@@ -896,20 +900,21 @@ int add_user(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int a
                 xmlStrPrintf(tmp, 64, (xmlChar *) "%i%c", certid, '\0');
                 xmlNewChild(usercert_n, NULL, (xmlChar *) "certid", tmp);
 
-		res_xml = eDBadminUserCertsLink(ctx, usercert_xml);
+                res_xml = eDBadminUserCertsLink(ctx, usercert_xml);
                 if( res_xml == NULL ) {
                         fprintf(stderr, "%s: Failed to register user <-> certificate link\n", MODULE);
-			goto exit;
+                        goto exit;
                 }
 
-		res = eurephiaXML_ParseResultMsg(ctx, res_xml);
-		if( res == NULL ) {
+                res = eurephiaXML_ParseResultMsg(ctx, res_xml);
+                if( res == NULL ) {
                         fprintf(stderr, "%s: Failed to register user <-> certificate link.  "
                                 "No results received\n", MODULE);
                 } else if( res->resultType == exmlERROR ) {
-			fprintf(stderr, "%s: %s\n", MODULE, res->message);
-		}
-		xmlFreeDoc(res_xml);
+                        fprintf(stderr, "%s: %s\n", MODULE, res->message);
+                }
+                free_nullsafe(ctx, res);
+                xmlFreeDoc(res_xml);
         }
  exit:
         return (uid > 0);