rwrap: improve debug error messages
[obnox/cwrap/resolv_wrapper.git] / src / resolv_wrapper.c
index 77baa452ab79b1ada5c344de714b0b33ce67965e..a2625610e23f54a75ea78b718fc1f5e7ddb25912 100644 (file)
 
 #include <errno.h>
 #include <arpa/inet.h>
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif /* HAVE_ARPA_NAMESER_H */
 #include <netinet/in.h>
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -69,6 +73,8 @@
 #define ns_name_compress dn_comp
 #endif
 
+#define ns_t_uri 256
+
 enum rwrap_dbglvl_e {
        RWRAP_LOG_ERROR = 0,
        RWRAP_LOG_WARN,
@@ -152,6 +158,8 @@ static void rwrap_log(enum rwrap_dbglvl_e dbglvl,
  */
 #define DFL_SRV_PRIO   1
 #define DFL_SRV_WEIGHT 100
+#define DFL_URI_PRIO   1
+#define DFL_URI_WEIGHT 100
 
 struct rwrap_srv_rrdata {
        uint16_t port;
@@ -160,6 +168,12 @@ struct rwrap_srv_rrdata {
        char hostname[MAXDNAME];
 };
 
+struct rwrap_uri_rrdata {
+       uint16_t prio;
+       uint16_t weight;
+       char uri[MAXDNAME];
+};
+
 struct rwrap_soa_rrdata {
        uint32_t serial;
        uint32_t refresh;
@@ -175,6 +189,7 @@ struct rwrap_fake_rr {
                struct in_addr a_rec;
                struct in6_addr aaaa_rec;
                struct rwrap_srv_rrdata srv_rec;
+               struct rwrap_uri_rrdata uri_rec;
                struct rwrap_soa_rrdata soa_rec;
                char cname_rec[MAXDNAME];
        } rrdata;
@@ -227,6 +242,15 @@ static int rwrap_create_fake_aaaa_rr(const char *key,
        rr->type = ns_t_aaaa;
        return 0;
 }
+static int rwrap_create_fake_ns_rr(const char *key,
+                                  const char *value,
+                                  struct rwrap_fake_rr *rr)
+{
+       memcpy(rr->rrdata.srv_rec.hostname, value, strlen(value) + 1);
+       memcpy(rr->key, key, strlen(key) + 1);
+       rr->type = ns_t_ns;
+       return 0;
+}
 
 static int rwrap_create_fake_srv_rr(const char *key,
                                    const char *value,
@@ -267,6 +291,42 @@ static int rwrap_create_fake_srv_rr(const char *key,
        return 0;
 }
 
+static int rwrap_create_fake_uri_rr(const char *key,
+                                   const char *value,
+                                   struct rwrap_fake_rr *rr)
+{
+       char *str_prio;
+       char *str_weight;
+       const char *uri;
+
+       /* parse the value into priority, weight, and uri
+        * and check the validity */
+       uri = value;
+       NEXT_KEY(uri, str_prio);
+       NEXT_KEY(str_prio, str_weight);
+       if (uri == NULL) {
+               RWRAP_LOG(RWRAP_LOG_ERROR,
+                         "Malformed URI entry [%s]\n", value);
+               return -1;
+       }
+
+       if (str_prio) {
+               rr->rrdata.uri_rec.prio = atoi(str_prio);
+       } else {
+               rr->rrdata.uri_rec.prio = DFL_URI_PRIO;
+       }
+       if (str_weight) {
+               rr->rrdata.uri_rec.weight = atoi(str_weight);
+       } else {
+               rr->rrdata.uri_rec.weight = DFL_URI_WEIGHT;
+       }
+       memcpy(rr->rrdata.uri_rec.uri, uri, strlen(uri) + 1);
+
+       memcpy(rr->key, key, strlen(key) + 1);
+       rr->type = ns_t_uri;
+       return 0;
+}
+
 static int rwrap_create_fake_soa_rr(const char *key,
                                    const char *value,
                                    struct rwrap_fake_rr *rr)
@@ -426,9 +486,8 @@ static ssize_t rwrap_fake_a(struct rwrap_fake_rr *rr,
        uint8_t *a = answer_ptr;
        ssize_t resp_size;
 
-       if (rr == NULL || rr->type != ns_t_a) {
-               RWRAP_LOG(RWRAP_LOG_ERROR,
-                         "Malformed record, no or wrong value!\n");
+       if (rr->type != ns_t_a) {
+               RWRAP_LOG(RWRAP_LOG_ERROR, "Wrong type!\n");
                return -1;
        }
        RWRAP_LOG(RWRAP_LOG_TRACE, "Adding A RR");
@@ -451,9 +510,8 @@ static ssize_t rwrap_fake_aaaa(struct rwrap_fake_rr *rr,
        uint8_t *a = answer;
        ssize_t resp_size;
 
-       if (rr == NULL || rr->type != ns_t_aaaa) {
-               RWRAP_LOG(RWRAP_LOG_ERROR,
-                         "Malformed record, no or wrong value!\n");
+       if (rr->type != ns_t_aaaa) {
+               RWRAP_LOG(RWRAP_LOG_ERROR, "Wrong type!\n");
                return -1;
        }
        RWRAP_LOG(RWRAP_LOG_TRACE, "Adding AAAA RR");
@@ -469,6 +527,46 @@ static ssize_t rwrap_fake_aaaa(struct rwrap_fake_rr *rr,
        return resp_size;
 }
 
+static ssize_t rwrap_fake_ns(struct rwrap_fake_rr *rr,
+                            uint8_t *answer,
+                           size_t anslen)
+{
+       uint8_t *a = answer;
+       ssize_t resp_size = 0;
+       size_t rdata_size;
+       unsigned char hostname_compressed[MAXDNAME];
+       ssize_t compressed_len;
+
+       if (rr->type != ns_t_ns) {
+               RWRAP_LOG(RWRAP_LOG_ERROR, "Wrong type!\n");
+               return -1;
+       }
+       RWRAP_LOG(RWRAP_LOG_TRACE, "Adding NS RR");
+
+       /* Prepare the data to write */
+       compressed_len = ns_name_compress(rr->rrdata.srv_rec.hostname,
+                                         hostname_compressed,
+                                         MAXDNAME,
+                                         NULL,
+                                         NULL);
+       if (compressed_len < 0) {
+               return -1;
+       }
+
+       /* Is this enough? */
+       rdata_size = compressed_len;
+
+       resp_size = rwrap_fake_rdata_common(ns_t_ns, rdata_size,
+                                           rr->key, anslen, &a);
+       if (resp_size < 0) {
+               return -1;
+       }
+
+       memcpy(a, hostname_compressed, compressed_len);
+
+       return resp_size;
+}
+
 static ssize_t rwrap_fake_srv(struct rwrap_fake_rr *rr,
                              uint8_t *answer,
                              size_t anslen)
@@ -479,9 +577,8 @@ static ssize_t rwrap_fake_srv(struct rwrap_fake_rr *rr,
        unsigned char hostname_compressed[MAXDNAME];
        ssize_t compressed_len;
 
-       if (rr == NULL || rr->type != ns_t_srv) {
-               RWRAP_LOG(RWRAP_LOG_ERROR,
-                         "Malformed record, no or wrong value!\n");
+       if (rr->type != ns_t_srv) {
+               RWRAP_LOG(RWRAP_LOG_ERROR, "Wrong type!\n");
                return -1;
        }
        RWRAP_LOG(RWRAP_LOG_TRACE, "Adding SRV RR");
@@ -510,6 +607,45 @@ static ssize_t rwrap_fake_srv(struct rwrap_fake_rr *rr,
        return resp_size;
 }
 
+static ssize_t rwrap_fake_uri(struct rwrap_fake_rr *rr,
+                             uint8_t *answer,
+                             size_t anslen)
+{
+       uint8_t *a = answer;
+       ssize_t resp_size;
+       size_t rdata_size;
+       unsigned char uri_compressed[MAXDNAME];
+       ssize_t compressed_len;
+
+       if (rr->type != ns_t_uri) {
+               RWRAP_LOG(RWRAP_LOG_ERROR, "Wrong type!\n");
+               return -1;
+       }
+       RWRAP_LOG(RWRAP_LOG_TRACE, "Adding URI RR");
+       rdata_size = 3 * sizeof(uint16_t);
+
+       /* Prepare the data to write */
+       compressed_len = ns_name_compress(rr->rrdata.uri_rec.uri,
+                                         uri_compressed, MAXDNAME,
+                                         NULL, NULL);
+       if (compressed_len < 0) {
+               return -1;
+       }
+       rdata_size += compressed_len;
+
+       resp_size = rwrap_fake_rdata_common(ns_t_uri, rdata_size,
+                                           rr->key, anslen, &a);
+       if (resp_size < 0) {
+               return -1;
+       }
+
+       NS_PUT16(rr->rrdata.uri_rec.prio, a);
+       NS_PUT16(rr->rrdata.uri_rec.weight, a);
+       memcpy(a, uri_compressed, compressed_len);
+
+       return resp_size;
+}
+
 static ssize_t rwrap_fake_soa(struct rwrap_fake_rr *rr,
                              uint8_t *answer,
                              size_t anslen)
@@ -522,9 +658,8 @@ static ssize_t rwrap_fake_soa(struct rwrap_fake_rr *rr,
        unsigned char mailbox_compressed[MAXDNAME];
        ssize_t compressed_mb_len;
 
-       if (rr == NULL || rr->type != ns_t_soa) {
-               RWRAP_LOG(RWRAP_LOG_ERROR,
-                         "Malformed record, no or wrong value!\n");
+       if (rr->type != ns_t_soa) {
+               RWRAP_LOG(RWRAP_LOG_ERROR, "Wrong type!\n");
                return -1;
        }
        RWRAP_LOG(RWRAP_LOG_TRACE, "Adding SOA RR");
@@ -574,9 +709,8 @@ static ssize_t rwrap_fake_cname(struct rwrap_fake_rr *rr,
        unsigned char hostname_compressed[MAXDNAME];
        ssize_t rdata_size;
 
-       if (rr == NULL || rr->type != ns_t_cname) {
-               RWRAP_LOG(RWRAP_LOG_ERROR,
-                         "Malformed record, no or wrong value!\n");
+       if (rr->type != ns_t_cname) {
+               RWRAP_LOG(RWRAP_LOG_ERROR, "Wrong type!\n");
                return -1;
        }
        RWRAP_LOG(RWRAP_LOG_TRACE, "Adding CNAME RR");
@@ -662,7 +796,8 @@ static int rwrap_get_record(const char *hostfile, unsigned recursion,
        }
 
        RWRAP_LOG(RWRAP_LOG_TRACE,
-                 "Searching in fake hosts file %s\n", hostfile);
+                 "Searching in fake hosts file %s for %s:%d\n", hostfile,
+                 query, type);
 
        fp = fopen(hostfile, "r");
        if (fp == NULL) {
@@ -702,6 +837,10 @@ static int rwrap_get_record(const char *hostfile, unsigned recursion,
                                      rec_type, "AAAA", key, query)) {
                        rc = rwrap_create_fake_aaaa_rr(key, value, rr);
                        break;
+               } else if (TYPE_MATCH(type, ns_t_ns,
+                                     rec_type, "NS", key, query)) {
+                       rc = rwrap_create_fake_ns_rr(key, value, rr);
+                       break;
                } else if (TYPE_MATCH(type, ns_t_srv,
                                      rec_type, "SRV", key, query)) {
                        rc = rwrap_create_fake_srv_rr(key, value, rr);
@@ -711,6 +850,10 @@ static int rwrap_get_record(const char *hostfile, unsigned recursion,
                                                rr + 1);
                        }
                        break;
+               } else if (TYPE_MATCH(type, ns_t_uri,
+                                     rec_type, "URI", key, query)) {
+                       rc = rwrap_create_fake_uri_rr(key, value, rr);
+                       break;
                } else if (TYPE_MATCH(type, ns_t_soa,
                                      rec_type, "SOA", key, query)) {
                        rc = rwrap_create_fake_soa_rr(key, value, rr);
@@ -776,7 +919,9 @@ static inline bool rwrap_known_type(int type)
        switch (type) {
        case ns_t_a:
        case ns_t_aaaa:
+       case ns_t_ns:
        case ns_t_srv:
+       case ns_t_uri:
        case ns_t_soa:
        case ns_t_cname:
                return true;
@@ -828,6 +973,11 @@ static ssize_t rwrap_add_rr(struct rwrap_fake_rr *rr,
 {
        ssize_t resp_data;
 
+       if (rr == NULL) {
+               RWRAP_LOG(RWRAP_LOG_ERROR, "Internal error!\n");
+               return -1;
+       }
+
        switch (rr->type) {
        case ns_t_a:
                resp_data = rwrap_fake_a(rr, answer, anslen);
@@ -835,9 +985,15 @@ static ssize_t rwrap_add_rr(struct rwrap_fake_rr *rr,
        case ns_t_aaaa:
                resp_data = rwrap_fake_aaaa(rr, answer, anslen);
                break;
+       case ns_t_ns:
+               resp_data = rwrap_fake_ns(rr, answer, anslen);
+               break;
        case ns_t_srv:
                resp_data = rwrap_fake_srv(rr, answer, anslen);
                break;
+       case ns_t_uri:
+               resp_data = rwrap_fake_uri(rr, answer, anslen);
+               break;
        case ns_t_soa:
                resp_data = rwrap_fake_soa(rr, answer, anslen);
                break;
@@ -1421,8 +1577,8 @@ static int rwrap_res_ninit(struct __res_state *state)
                        state->nscount = 0;
                        memset(state->nsaddr_list, 0, sizeof(state->nsaddr_list));
 
-                       state->_u._ext.nscount = 0;
 #ifdef HAVE_RESOLV_IPV6_NSADDRS
+                       state->_u._ext.nscount = 0;
                        for (i = 0; i < state->_u._ext.nscount; i++) {
                                SAFE_FREE(state->_u._ext.nsaddrs[i]);
                        }