/*
- * $Id$
- *
* Server-side module for Wiki rooms. This handles things like version control.
*
- * Copyright (c) 2009 by the citadel.org team
+ * Copyright (c) 2009-2011 by the citadel.org team
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software. You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
#include "config.h"
#include "control.h"
#include "user_ops.h"
-#include "policy.h"
#include "database.h"
#include "msgbase.h"
#include "euidindex.h"
struct CtdlMessage *history_msg = NULL;
char diff_old_filename[PATH_MAX];
char diff_new_filename[PATH_MAX];
+ char diff_out_filename[PATH_MAX];
char diff_cmd[PATH_MAX];
FILE *fp;
int rv;
char boundary[256];
char prefixed_boundary[258];
char buf[1024];
- int nbytes = 0;
char *diffbuf = NULL;
size_t diffbuf_len = 0;
char *ptr = NULL;
/* If this isn't a MIME message, don't bother. */
if (msg->cm_format_type != 4) return(0);
- /* If there's no EUID we can't do this. */
- if (msg->cm_fields['E'] == NULL) return(0);
+ /* If there's no EUID we can't do this. Reject the post. */
+ if (msg->cm_fields['E'] == NULL) return(1);
+
snprintf(history_page, sizeof history_page, "%s_HISTORY_", msg->cm_fields['E']);
/* Make sure we're saving a real wiki page rather than a wiki history page.
if ( (strlen(msg->cm_fields['E']) >= 9)
&& (!strcasecmp(&msg->cm_fields['E'][strlen(msg->cm_fields['E'])-9], "_HISTORY_"))
) {
- CtdlLogPrintf(CTDL_DEBUG, "History page not being historied\n");
+ syslog(LOG_DEBUG, "History page not being historied\n");
return(0);
}
msg->cm_fields['U'] = strdup(msg->cm_fields['E']);
/* See if we can retrieve the previous version. */
- old_msgnum = locate_message_by_euid(msg->cm_fields['E'], &CCC->room);
+ old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields['E'], &CCC->room);
if (old_msgnum > 0L) {
old_msg = CtdlFetchMessage(old_msgnum, 1);
}
*/
CtdlMakeTempFileName(diff_old_filename, sizeof diff_old_filename);
CtdlMakeTempFileName(diff_new_filename, sizeof diff_new_filename);
+ CtdlMakeTempFileName(diff_out_filename, sizeof diff_out_filename);
if (old_msg != NULL) {
fp = fopen(diff_old_filename, "w");
rv = fwrite(msg->cm_fields['M'], strlen(msg->cm_fields['M']), 1, fp);
fclose(fp);
- diffbuf_len = 0;
- diffbuf = NULL;
snprintf(diff_cmd, sizeof diff_cmd,
- "diff -u %s %s",
+ DIFF " -u %s %s >%s",
diff_new_filename,
- ((old_msg != NULL) ? diff_old_filename : "/dev/null")
+ ((old_msg != NULL) ? diff_old_filename : "/dev/null"),
+ diff_out_filename
);
- fp = popen(diff_cmd, "r");
+ syslog(LOG_DEBUG, "diff cmd: %s", diff_cmd);
+ rv = system(diff_cmd);
+ syslog(LOG_DEBUG, "diff cmd returned %d", rv);
+
+ diffbuf_len = 0;
+ diffbuf = NULL;
+ fp = fopen(diff_out_filename, "r");
+ if (fp == NULL) {
+ fp = fopen("/dev/null", "r");
+ }
if (fp != NULL) {
- do {
- diffbuf = realloc(diffbuf, diffbuf_len + 1025);
- nbytes = fread(&diffbuf[diffbuf_len], 1, 1024, fp);
- diffbuf_len += nbytes;
- } while (nbytes == 1024);
+ fseek(fp, 0L, SEEK_END);
+ diffbuf_len = ftell(fp);
+ fseek(fp, 0L, SEEK_SET);
+ diffbuf = malloc(diffbuf_len + 1);
+ fread(diffbuf, diffbuf_len, 1, fp);
diffbuf[diffbuf_len] = 0;
- pclose(fp);
+ fclose(fp);
}
- CtdlLogPrintf(CTDL_DEBUG, "diff length is %d bytes\n", diffbuf_len);
+
+ syslog(LOG_DEBUG, "diff length is "SIZE_T_FMT" bytes", diffbuf_len);
unlink(diff_old_filename);
unlink(diff_new_filename);
+ unlink(diff_out_filename);
/* Determine whether this was a bogus (empty) edit */
if ((diffbuf_len = 0) && (diffbuf != NULL)) {
/* Now look for the existing edit history */
- history_msgnum = locate_message_by_euid(history_page, &CCC->room);
+ history_msgnum = CtdlLocateMessageByEuid(history_page, &CCC->room);
history_msg = NULL;
if (history_msgnum > 0L) {
history_msg = CtdlFetchMessage(history_msgnum, 1);
/* Update the history message (regardless of whether it's new or existing) */
- /* First, figure out the boundary string. We do this even when we generated the
+ /* Remove the Message-ID from the old version of the history message. This will cause a brand
+ * new one to be generated, avoiding an uninitentional hit of the loop zapper when we replicate.
+ */
+ if (history_msg->cm_fields['I'] != NULL) {
+ free(history_msg->cm_fields['I']);
+ history_msg->cm_fields['I'] = NULL;
+ }
+
+ /* Figure out the boundary string. We do this even when we generated the
* boundary string in the above code, just to be safe and consistent.
*/
strcpy(boundary, "");
}
} while ( (IsEmptyStr(boundary)) && (*ptr != 0) );
- /* Now look for the first boundary. That is where we need to insert our fun.
+ /*
+ * Now look for the first boundary. That is where we need to insert our fun.
*/
if (!IsEmptyStr(boundary)) {
snprintf(prefixed_boundary, sizeof prefixed_boundary, "--%s", boundary);
ptr = bmstrcasestr(history_msg->cm_fields['M'], prefixed_boundary);
if (ptr != NULL) {
char *the_rest_of_it = strdup(ptr);
- char uuid[32];
+ char uuid[64];
char memo[512];
- char encoded_memo[768];
+ char encoded_memo[1024];
generate_uuid(uuid);
snprintf(memo, sizeof memo, "%s|%ld|%s|%s",
uuid,
time(NULL),
CCC->user.fullname,
config.c_nodename
- /* no longer logging CCC->cs_inet_email */
);
CtdlEncodeBase64(encoded_memo, memo, strlen(memo), 0);
sprintf(ptr, "--%s\n"
}
history_msg->cm_fields['T'] = realloc(history_msg->cm_fields['T'], 32);
- snprintf(history_msg->cm_fields['T'], 32, "%ld", time(NULL));
+ if (history_msg->cm_fields['T'] != NULL) {
+ snprintf(history_msg->cm_fields['T'], 32, "%ld", time(NULL));
+ }
CtdlSubmitMsg(history_msg, NULL, "", 0);
}
else {
- CtdlLogPrintf(CTDL_ALERT, "Empty boundary string in history message. No history!\n");
+ syslog(LOG_ALERT, "Empty boundary string in history message. No history!\n");
}
free(diffbuf);
}
snprintf(history_page_name, sizeof history_page_name, "%s_HISTORY_", pagename);
- msgnum = locate_message_by_euid(history_page_name, &CC->room);
+ msgnum = CtdlLocateMessageByEuid(history_page_name, &CC->room);
if (msgnum > 0L) {
msg = CtdlFetchMessage(msgnum, 1);
}
CtdlDecodeBase64(memo, filename, strlen(filename));
extract_token(this_rev, memo, 0, '|', sizeof this_rev);
- CtdlLogPrintf(CTDL_DEBUG, "callback found rev: %s\n", this_rev);
+ syslog(LOG_DEBUG, "callback found rev: %s\n", this_rev);
/* Perform the patch */
- fp = popen("patch -f -s -p0 >/dev/null 2>/dev/null", "w");
+ fp = popen(PATCH " -f -s -p0 -r /dev/null >/dev/null 2>/dev/null", "w");
if (fp) {
/* Replace the filenames in the patch with the tempfilename we're actually tweaking */
fprintf(fp, "--- %s\n", hecbd->tempfilename);
fprintf(fp, "%s\n", buf);
}
}
- } while ((*ptr != 0) && ((int)ptr < ((int)content + length)));
- pclose(fp);
+ } while ((*ptr != 0) && (ptr < ((char*)content + length)));
+ if (pclose(fp) != 0) {
+ syslog(LOG_ERR, "pclose() returned an error - patch failed\n");
+ }
}
if (!strcasecmp(this_rev, hecbd->stop_when)) {
/* Found our target rev. Tell any subsequent callbacks to suppress processing. */
- CtdlLogPrintf(CTDL_DEBUG, "Target revision has been reached -- stop patching.\n");
+ syslog(LOG_DEBUG, "Target revision has been reached -- stop patching.\n");
hecbd->done = 1;
}
}
return;
}
+ if (!strcasecmp(operation, "revert")) {
+ r = CtdlDoIHavePermissionToPostInThisRoom(temp, sizeof temp, NULL, POST_LOGGED_IN, 0);
+ if (r != 0) {
+ cprintf("%d %s\n", r, temp);
+ return;
+ }
+ }
+
/* Begin by fetching the current version of the page. We're going to patch
* backwards through the diffs until we get the one we want.
*/
- msgnum = locate_message_by_euid(pagename, &CC->room);
+ msgnum = CtdlLocateMessageByEuid(pagename, &CC->room);
if (msgnum > 0L) {
msg = CtdlFetchMessage(msgnum, 1);
}
fclose(fp);
}
else {
- CtdlLogPrintf(CTDL_ALERT, "Cannot open %s: %s\n", temp, strerror(errno));
+ syslog(LOG_ALERT, "Cannot open %s: %s\n", temp, strerror(errno));
}
CtdlFreeMessage(msg);
/* Get the revision history */
snprintf(history_page_name, sizeof history_page_name, "%s_HISTORY_", pagename);
- msgnum = locate_message_by_euid(history_page_name, &CC->room);
+ msgnum = CtdlLocateMessageByEuid(history_page_name, &CC->room);
if (msgnum > 0L) {
msg = CtdlFetchMessage(msgnum, 1);
}
fseek(fp, 0L, SEEK_SET);
msg->cm_fields['M'] = malloc(len + 1);
rv = fread(msg->cm_fields['M'], len, 1, fp);
- CtdlLogPrintf(CTDL_DEBUG, "\033[32mdid %d blocks of %d bytes\033[0m\n", rv, len);
+ syslog(LOG_DEBUG, "did %d blocks of %ld bytes\n", rv, len);
msg->cm_fields['M'][len] = 0;
fclose(fp);
}
msg->cm_fields['A'] = strdup("Citadel");
CtdlCreateRoom(wwm, 5, "", 0, 1, 1, VIEW_BBS); /* Not an error if already exists */
msgnum = CtdlSubmitMsg(msg, NULL, wwm, 0); /* Store the revision here */
+
+ /*
+ * WARNING: VILE SLEAZY HACK
+ * This will avoid the 'message xxx is not in this room' security error,
+ * but only if the client fetches the message we just generated immediately
+ * without first trying to perform other fetch operations.
+ */
+ if (CC->cached_msglist != NULL) {
+ free(CC->cached_msglist);
+ CC->cached_msglist = NULL;
+ CC->cached_num_msgs = 0;
+ }
+ CC->cached_msglist = malloc(sizeof(long));
+ if (CC->cached_msglist != NULL) {
+ CC->cached_num_msgs = 1;
+ CC->cached_msglist[0] = msgnum;
+ }
+
}
else if (!strcasecmp(operation, "revert")) {
snprintf(timestamp, sizeof timestamp, "%ld", time(NULL));
CtdlRegisterProtoHook(cmd_wiki, "WIKI", "Commands related to Wiki management");
}
- /* return our Subversion id for the Log */
- return "$Id$";
+ /* return our module name for the log */
+ return "wiki";
}
projects / citadel.git / blobdiff