}
+
+/* store a value in the binary tree */
+void seenit_store(struct seenit **si, long msgnum) {
+ struct seenit *this_si;
+
+ if (*si == NULL) { /* store now */
+ *si = malloc(sizeof(struct seenit));
+ this_si = *si;
+ this_si->l = NULL;
+ this_si->r = NULL;
+ this_si->msgnum = msgnum;
+ return;
+ }
+
+ this_si = *si;
+ if (msgnum < this_si->msgnum) {
+ seenit_store(&this_si->l, msgnum);
+ }
+ else if (msgnum > this_si->msgnum) {
+ seenit_store(&this_si->r, msgnum);
+ }
+ else {
+ return;
+ }
+}
+
+
+/* search for a value in the binary tree */
+int seenit_isthere(struct seenit *si, long msgnum) {
+ if (!si) return(0); /* not there */
+ if (msgnum < si->msgnum) return(seenit_isthere(si->l, msgnum));
+ if (msgnum > si->msgnum) return(seenit_isthere(si->r, msgnum));
+ return(1); /* found it */
+}
+
+
+/* free the binary tree */
+void seenit_free(struct seenit **si) {
+ struct seenit *this_si = *si;
+ if (!this_si) return;
+ seenit_free(&this_si->l);
+ seenit_free(&this_si->r);
+ free(this_si);
+ *si = NULL;
+}
+
+
+
+
+
/*
* API function to perform an operation for each qualifying message in the
* current room. (Returns the number of messages processed.)
cdbfr->ptr = NULL; /* clear this so that cdb_free() doesn't free it */
cdb_free(cdbfr); /* we own this memory now */
- /*
- * We cache the most recent msglist in order to do security checks later
- */
- if (CC->client_socket > 0) {
- if (CC->cached_msglist != NULL) {
- free(CC->cached_msglist);
- }
-
- CC->cached_msglist = msglist;
- }
-
/*
* Now begin the traversal.
*/
if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) {
+ /*
+ * cache the msgnums we've seen in order to perform security checks later
+ */
+ if (CC->client_socket > 0) {
+ seenit_store(&CC->cached_msglist, msglist[a]);
+ }
+
/* If the caller is looking for a specific MIME type, filter
* out all messages which are not of the type requested.
*/
}
}
if (need_to_free_re) regfree(&re);
- if (CC->client_socket <= 0) free(msglist);
+ free(msglist);
return num_processed;
}
}
+/*
+ * Determine whether the specified message exists in the cached_msglist
+ * (This is a security check)
+ */
+int check_cached_msglist(long msgnum) {
+
+ /* cases in which we skip the check */
+ if (!CC) return om_ok; /* not a session */
+ if (CC->client_socket <= 0) return om_ok; /* not a client session */
+ if (CC->cached_msglist == NULL) return om_access_denied; /* no msglist fetched */
+
+ if (seenit_isthere(CC->cached_msglist, msgnum)) {
+ return om_ok;
+ }
+
+ return om_access_denied;
+}
+
+
/*
* Determine whether the currently logged in session has permission to read
* messages in the current room.
return(r);
}
+ r = check_cached_msglist(msg_num);
+ if (r != om_ok) {
+ syslog(LOG_DEBUG, "Denying access to message %ld - not yet listed\n", msg_num);
+ if (do_proto) {
+ if (r == om_access_denied) {
+ cprintf("%d Message %ld was not found in this room.\n",
+ ERROR + MESSAGE_NOT_FOUND,
+ msg_num
+ );
+ }
+ else {
+ cprintf("%d An unknown error has occurred.\n", ERROR);
+ }
+ return(r);
+ }
+ }
+
/*
* Fetch the message from disk. If we're in HEADERS_FAST mode,
* request that we don't even bother loading the body into memory.