HS 2.0 server: Alternative subrem updateNode for certificate credentials

The new subrem field in the users database can now be used to issue an
alternative subscription remediation updateNode for clients using
certificate credentials. The data file for this case is similar to the
policy update files, but it starts with the managementTreeURI value in
the first line.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

diff --git a/hs20/server/spp_server.c b/hs20/server/spp_server.c
index d848278fb55fc6e39b88bd497bf91b1ce84e2b32..4bef0ffb2d4ee8bf89bc92e3366dc4726f931699 100644 (file)
--- a/hs20/server/spp_server.c
+++ b/hs20/server/spp_server.c
@@ -790,6 +790,45 @@ static int add_update_node(struct hs20_svc *ctx, xml_node_t *spp_node,
 }
 
 
+static xml_node_t * read_subrem_file(struct hs20_svc *ctx,
+                                    const char *subrem_id,
+                                    char *uri, size_t uri_size)
+{
+       char fname[200];
+       char *buf, *buf2, *pos;
+       size_t len;
+       xml_node_t *node;
+
+       os_snprintf(fname, sizeof(fname), "%s/spp/subrem/%s",
+                   ctx->root_dir, subrem_id);
+       debug_print(ctx, 1, "Use subrem file %s", fname);
+
+       buf = os_readfile(fname, &len);
+       if (!buf)
+               return NULL;
+       buf2 = os_realloc(buf, len + 1);
+       if (!buf2) {
+               os_free(buf);
+               return NULL;
+       }
+       buf = buf2;
+       buf[len] = '\0';
+
+       pos = os_strchr(buf, '\n');
+       if (!pos) {
+               os_free(buf);
+               return NULL;
+       }
+       *pos++ = '\0';
+       os_strlcpy(uri, buf, uri_size);
+
+       node = xml_node_from_buf(ctx->xml, pos);
+       os_free(buf);
+
+       return node;
+}
+
+
 static xml_node_t * build_sub_rem_resp(struct hs20_svc *ctx,
                                       const char *user, const char *realm,
                                       const char *session_id,
@@ -808,8 +847,24 @@ static xml_node_t * build_sub_rem_resp(struct hs20_svc *ctx,
                cert = NULL;
        }
        if (cert) {
-               /* No change needed in PPS MO */
+               char *subrem;
+
+               /* No change needed in PPS MO unless specifically asked to */
                cred = NULL;
+               buf[0] = '\0';
+
+               subrem = db_get_val(ctx, user, realm, "subrem", dmacc);
+               if (subrem && subrem[0]) {
+                       cred = read_subrem_file(ctx, subrem, buf, sizeof(buf));
+                       if (!cred) {
+                               debug_print(ctx, 1,
+                                           "Could not create updateNode from subrem file");
+                               os_free(subrem);
+                               os_free(cert);
+                               return NULL;
+                       }
+               }
+               os_free(subrem);
        } else {
                char *real_user = NULL;
                char *pw;
@@ -847,6 +902,10 @@ static xml_node_t * build_sub_rem_resp(struct hs20_svc *ctx,
                        os_free(cert);
                        return NULL;
                }
+
+               snprintf(buf, sizeof(buf),
+                        "./Wi-Fi/%s/PerProviderSubscription/Cred01/Credential",
+                        realm);
        }
 
        status = "Remediation complete, request sppUpdateResponse";
@@ -858,10 +917,6 @@ static xml_node_t * build_sub_rem_resp(struct hs20_svc *ctx,
                return NULL;
        }
 
-       snprintf(buf, sizeof(buf),
-                "./Wi-Fi/%s/PerProviderSubscription/Cred01/Credential",
-                realm);
-
        if ((cred && add_update_node(ctx, spp_node, ns, buf, cred) < 0) ||
            (!cred && !xml_node_create(ctx->xml, spp_node, ns, "noMOUpdate"))) {
                debug_print(ctx, 1, "Could not add update node");

diff --git a/hs20/server/sql.txt b/hs20/server/sql.txt
index 1ce30404dc5ef1a71a57f6279287dcf481d26125..2cc6edea4063ef98d310ca9de3ab6697f02859e7 100644 (file)
--- a/hs20/server/sql.txt
+++ b/hs20/server/sql.txt
@@ -61,6 +61,7 @@ CREATE TABLE users(
        mac_addr TEXT,
        last_msk TEXT,
        polupd_done TEXT,
+       subrem TEXT
 );
 
 CREATE TABLE wildcards(