/*
- * Bacula File Daemon backup.c send file attributes and data
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version two of the GNU General Public
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
+
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ * Bacula File Daemon backup.c send file attributes and data
* to the Storage daemon.
*
* Kern Sibbald, March MM
* Version $Id$
*
*/
+
+#include "bacula.h"
+#include "filed.h"
+#include "lib/htable.h"
+
+/* Forward referenced functions */
+int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level);
+static void strip_path(FF_PKT *ff_pkt);
+static void unstrip_path(FF_PKT *ff_pkt);
+static int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, DIGEST *digest, DIGEST *signature_digest);
+static bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream);
+static bool read_and_send_acl(JCR *jcr, int acltype, int stream);
+static bool crypto_session_start(JCR *jcr);
+static void crypto_session_end(JCR *jcr);
+static bool crypto_session_send(JCR *jcr, BSOCK *sd);
+
+typedef struct CurFile {
+ hlink link;
+ char *fname;
+ char *lstat;
+ bool seen;
+} CurFile;
+
+#define accurate_mark_file_as_seen(elt) ((elt)->seen = 1)
+#define accurate_file_has_been_seen(elt) ((elt)->seen)
+
/*
- Copyright (C) 2000-2004 Kern Sibbald and John Walker
+ * This function is called for each file seen in fileset.
+ * We check in file_list hash if fname have been backuped
+ * the last time. After we can compare Lstat field.
+ *
+ */
+/* TODO: tweak verify code to use the same function ?? */
+bool accurate_check_file(JCR *jcr, FF_PKT *ff_pkt)
+{
+ char *p;
+ int stat=false;
+ struct stat statc; /* catalog stat */
+ char *Opts_Digest;
+ char *fname;
+ CurFile *elt;
- 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 2 of
- the License, or (at your option) any later version.
+ int32_t LinkFIc;
- 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.
+ if (*ff_pkt->VerifyOpts) { /* use mtime + ctime checks by default */
+ Opts_Digest = ff_pkt->VerifyOpts;
+ } else {
+ Opts_Digest = "cm";
+ }
- 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.
+ if (jcr->accurate == false || jcr->JobLevel == L_FULL) {
+ return true;
+ }
- */
+ strip_path(ff_pkt);
+
+ if (S_ISDIR(ff_pkt->statp.st_mode)) {
+ fname = ff_pkt->link;
+ } else {
+ fname = ff_pkt->fname;
+ }
-#include "bacula.h"
-#include "filed.h"
+ elt = (CurFile *) jcr->file_list->lookup(fname);
-#ifdef HAVE_ACL
-#include <sys/acl.h>
-#include <acl/libacl.h>
-#endif
+ if (!elt) {
+ Dmsg1(500, "accurate %s = yes (not found)\n", fname);
+ stat=true;
+ goto bail_out;
+ }
+
+ if (accurate_file_has_been_seen(elt)) {
+ Dmsg1(500, "accurate %s = no (already seen)\n", fname);
+ stat=false;
+ goto bail_out;
+ }
-static int save_file(FF_PKT *ff_pkt, void *pkt);
+ decode_stat(elt->lstat, &statc, &LinkFIc); /* decode catalog stat */
+// *do_Digest = CRYPTO_DIGEST_NONE;
+
+ for (p=Opts_Digest; *p; p++) {
+ char ed1[30], ed2[30];
+ switch (*p) {
+ case 'i': /* compare INODEs */
+ if (statc.st_ino != ff_pkt->statp.st_ino) {
+ Jmsg(jcr, M_SAVED, 0, _("%s st_ino differ. Cat: %s File: %s\n"), fname,
+ edit_uint64((uint64_t)statc.st_ino, ed1),
+ edit_uint64((uint64_t)ff_pkt->statp.st_ino, ed2));
+ stat = true;
+ }
+ break;
+ case 'p': /* permissions bits */
+ if (statc.st_mode != ff_pkt->statp.st_mode) {
+ Jmsg(jcr, M_SAVED, 0, _("%s st_mode differ. Cat: %x File: %x\n"), fname,
+ (uint32_t)statc.st_mode, (uint32_t)ff_pkt->statp.st_mode);
+ stat = true;
+ }
+ break;
+// case 'n': /* number of links */
+// if (statc.st_nlink != ff_pkt->statp.st_nlink) {
+// Jmsg(jcr, M_SAVED, 0, _("%s st_nlink differ. Cat: %d File: %d\n"), fname,
+// (uint32_t)statc.st_nlink, (uint32_t)ff_pkt->statp.st_nlink);
+// stat = true;
+// }
+// break;
+ case 'u': /* user id */
+ if (statc.st_uid != ff_pkt->statp.st_uid) {
+ Jmsg(jcr, M_SAVED, 0, _("%s st_uid differ. Cat: %u File: %u\n"), fname,
+ (uint32_t)statc.st_uid, (uint32_t)ff_pkt->statp.st_uid);
+ stat = true;
+ }
+ break;
+ case 'g': /* group id */
+ if (statc.st_gid != ff_pkt->statp.st_gid) {
+ Jmsg(jcr, M_SAVED, 0, _("%s st_gid differ. Cat: %u File: %u\n"), fname,
+ (uint32_t)statc.st_gid, (uint32_t)ff_pkt->statp.st_gid);
+ stat = true;
+ }
+ break;
+ case 's': /* size */
+ if (statc.st_size != ff_pkt->statp.st_size) {
+ Jmsg(jcr, M_SAVED, 0, _("%s st_size differ. Cat: %s File: %s\n"), fname,
+ edit_uint64((uint64_t)statc.st_size, ed1),
+ edit_uint64((uint64_t)ff_pkt->statp.st_size, ed2));
+ stat = true;
+ }
+ break;
+// case 'a': /* access time */
+// if (statc.st_atime != ff_pkt->statp.st_atime) {
+// Jmsg(jcr, M_SAVED, 0, _("%s st_atime differs\n"), fname);
+// stat = true;
+// }
+// break;
+ case 'm':
+ if (statc.st_mtime != ff_pkt->statp.st_mtime) {
+ Jmsg(jcr, M_SAVED, 0, _("%s st_mtime differs\n"), fname);
+ stat = true;
+ }
+ break;
+ case 'c': /* ctime */
+ if (statc.st_ctime != ff_pkt->statp.st_ctime) {
+ Jmsg(jcr, M_SAVED, 0, _("%s st_ctime differs\n"), fname);
+ stat = true;
+ }
+ break;
+ case 'd': /* file size decrease */
+ if (statc.st_size > ff_pkt->statp.st_size) {
+ Jmsg(jcr, M_SAVED, 0, _("%s st_size decrease. Cat: %s File: %s\n"), fname,
+ edit_uint64((uint64_t)statc.st_size, ed1),
+ edit_uint64((uint64_t)ff_pkt->statp.st_size, ed2));
+ stat = true;
+ }
+ break;
+ case '5': /* compare MD5 */
+ Dmsg1(500, "set Do_MD5 for %s\n", ff_pkt->fname);
+// *do_Digest = CRYPTO_DIGEST_MD5;
+ break;
+ case '1': /* compare SHA1 */
+// *do_Digest = CRYPTO_DIGEST_SHA1;
+ break;
+ case ':':
+ case 'V':
+ default:
+ break;
+ }
+ }
+ accurate_mark_file_as_seen(elt);
+ Dmsg2(500, "accurate %s = %i\n", fname, stat);
+
+bail_out:
+ unstrip_path(ff_pkt);
+ return stat;
+}
/*
+ * This function doesn't work very well with smartalloc
+ * TODO: use bigbuffer from htable
+ */
+int accurate_cmd(JCR *jcr)
+{
+ BSOCK *dir = jcr->dir_bsock;
+ int len;
+ uint64_t nb;
+ CurFile *elt=NULL;
+
+ if (jcr->accurate==false || job_canceled(jcr) || jcr->JobLevel==L_FULL) {
+ return true;
+ }
+
+ if (sscanf(dir->msg, "accurate files=%ld", &nb) != 1) {
+ dir->fsend(_("2991 Bad accurate command\n"));
+ return false;
+ }
+
+ jcr->file_list = (htable *)malloc(sizeof(htable));
+ jcr->file_list->init(elt, &elt->link, nb);
+
+ /*
+ * buffer = sizeof(CurFile) + dirmsg
+ * dirmsg = fname + lstat
+ */
+ /* get current files */
+ while (dir->recv() >= 0) {
+ len = strlen(dir->msg);
+ if ((len+1) < dir->msglen) {
+// elt = (CurFile *)malloc(sizeof(CurFile));
+// elt->fname = (char *) malloc(dir->msglen+1);
+
+ /* we store CurFile, fname and lstat in the same chunk */
+ elt = (CurFile *)malloc(sizeof(CurFile)+dir->msglen+1);
+ elt->fname = (char *) elt+sizeof(CurFile);
+ memcpy(elt->fname, dir->msg, dir->msglen);
+ elt->fname[dir->msglen]='\0';
+ elt->lstat = elt->fname + len + 1;
+ elt->seen=0;
+ jcr->file_list->insert(elt->fname, elt);
+ Dmsg2(500, "add fname=%s lstat=%s\n", elt->fname, elt->lstat);
+ }
+ }
+
+// jcr->file_list->stats();
+ /* TODO: send a EOM ?
+ dir->fsend("2000 OK accurate\n");
+ */
+ return true;
+}
+
+bool accurate_send_deleted_list(JCR *jcr)
+{
+ CurFile *elt;
+ FF_PKT *ff_pkt;
+
+ int stream = STREAM_UNIX_ATTRIBUTES;
+
+ if (jcr->accurate == false || jcr->JobLevel == L_FULL) {
+ goto bail_out;
+ }
+
+ if (jcr->file_list == NULL) {
+ goto bail_out;
+ }
+
+ ff_pkt = init_find_files();
+ ff_pkt->type = FT_DELETED;
+
+ foreach_htable (elt, jcr->file_list) {
+ if (!accurate_file_has_been_seen(elt)) { /* already seen */
+ Dmsg3(500, "deleted fname=%s lstat=%s seen=%i\n", elt->fname, elt->lstat, elt->seen);
+ ff_pkt->fname = elt->fname;
+ decode_stat(elt->lstat, &ff_pkt->statp, &ff_pkt->LinkFI); /* decode catalog stat */
+ encode_and_send_attributes(jcr, ff_pkt, stream);
+ }
+// Free(elt->fname);
+ }
+ term_find_files(ff_pkt);
+bail_out:
+ /* TODO: clean htable when this function is not reached ? */
+ if (jcr->file_list) {
+ jcr->file_list->destroy();
+ free(jcr->file_list);
+ jcr->file_list = NULL;
+ }
+ return true;
+}
+
+/*
* Find all the requested files and send them
- * to the Storage daemon.
+ * to the Storage daemon.
*
* Note, we normally carry on a one-way
* conversation from this point on with the SD, simply blasting
* also run a "heartbeat" monitor which reads the socket and
* reacts accordingly (at the moment it has nothing to do
* except echo the heartbeat to the Director).
- *
+ *
*/
-bool blast_data_to_storage_daemon(JCR *jcr, char *addr)
+bool blast_data_to_storage_daemon(JCR *jcr, char *addr)
{
BSOCK *sd;
bool ok = true;
+ // TODO landonf: Allow user to specify encryption algorithm
sd = jcr->store_bsock;
set_jcr_job_status(jcr, JS_Running);
- Dmsg1(300, "bfiled: opened data connection %d to stored\n", sd->fd);
+ Dmsg1(300, "bfiled: opened data connection %d to stored\n", sd->m_fd);
LockRes();
CLIENT *client = (CLIENT *)GetNextRes(R_CLIENT, NULL);
if (client) {
buf_size = client->max_network_buffer_size;
} else {
- buf_size = 0; /* use default */
+ buf_size = 0; /* use default */
}
if (!bnet_set_buffer_size(sd, buf_size, BNET_SETBUF_WRITE)) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
return false;
}
- jcr->buf_size = sd->msglen;
+ jcr->buf_size = sd->msglen;
/* Adjust for compression so that output buffer is
* 12 bytes + 0.1% larger than input buffer plus 18 bytes.
* This gives a bit extra plus room for the sparse addr if any.
* Note, we adjust the read size to be smaller so that the
* same output buffer can be used without growing it.
+ *
+ * The zlib compression workset is initialized here to minimise
+ * the "per file" load. The jcr member is only set, if the init was successful.
*/
jcr->compress_buf_size = jcr->buf_size + ((jcr->buf_size+999) / 1000) + 30;
jcr->compress_buf = get_memory(jcr->compress_buf_size);
+
+#ifdef HAVE_LIBZ
+ z_stream *pZlibStream = (z_stream*)malloc(sizeof(z_stream));
+ if (pZlibStream) {
+ pZlibStream->zalloc = Z_NULL;
+ pZlibStream->zfree = Z_NULL;
+ pZlibStream->opaque = Z_NULL;
+ pZlibStream->state = Z_NULL;
+
+ if (deflateInit(pZlibStream, Z_DEFAULT_COMPRESSION) == Z_OK) {
+ jcr->pZLIB_compress_workset = pZlibStream;
+ } else {
+ free (pZlibStream);
+ }
+ }
+#endif
+
+ if (!crypto_session_start(jcr)) {
+ return false;
+ }
- Dmsg1(300, "set_find_options ff=%p\n", jcr->ff);
set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
- Dmsg0(300, "start find files\n");
+ /* in accurate mode, we overwrite the find_one check function */
+ if (jcr->accurate) {
+ set_find_changed_function((FF_PKT *)jcr->ff, accurate_check_file);
+ }
+
start_heartbeat_monitor(jcr);
+ jcr->acl_text = get_pool_memory(PM_MESSAGE);
+
/* Subroutine save_file() is called for each file */
- if (!find_files(jcr, (FF_PKT *)jcr->ff, save_file, (void *)jcr)) {
- ok = false; /* error */
+ if (!find_files(jcr, (FF_PKT *)jcr->ff, save_file, plugin_save)) {
+ ok = false; /* error */
set_jcr_job_status(jcr, JS_ErrorTerminated);
-// Jmsg(jcr, M_FATAL, 0, _("Find files error.\n"));
}
+ accurate_send_deleted_list(jcr); /* send deleted list to SD */
+
+ free_pool_memory(jcr->acl_text);
+
stop_heartbeat_monitor(jcr);
- bnet_sig(sd, BNET_EOD); /* end data connection */
+ sd->signal(BNET_EOD); /* end of sending data */
if (jcr->big_buf) {
free(jcr->big_buf);
free_pool_memory(jcr->compress_buf);
jcr->compress_buf = NULL;
}
- Dmsg1(300, "end blast_data stat=%d\n", ok);
+ if (jcr->pZLIB_compress_workset) {
+ /* Free the zlib stream */
+#ifdef HAVE_LIBZ
+ deflateEnd((z_stream *)jcr->pZLIB_compress_workset);
+#endif
+ free (jcr->pZLIB_compress_workset);
+ jcr->pZLIB_compress_workset = NULL;
+ }
+ crypto_session_end(jcr);
+
+
+ Dmsg1(100, "end blast_data ok=%d\n", ok);
return ok;
-}
+}
-/*
+static bool crypto_session_start(JCR *jcr)
+{
+ crypto_cipher_t cipher = CRYPTO_CIPHER_AES_128_CBC;
+
+ /*
+ * Create encryption session data and a cached, DER-encoded session data
+ * structure. We use a single session key for each backup, so we'll encode
+ * the session data only once.
+ */
+ if (jcr->crypto.pki_encrypt) {
+ uint32_t size = 0;
+
+ /* Create per-job session encryption context */
+ jcr->crypto.pki_session = crypto_session_new(cipher, jcr->crypto.pki_recipients);
+
+ /* Get the session data size */
+ if (!crypto_session_encode(jcr->crypto.pki_session, (uint8_t *)0, &size)) {
+ Jmsg(jcr, M_FATAL, 0, _("An error occurred while encrypting the stream.\n"));
+ return false;
+ }
+
+ /* Allocate buffer */
+ jcr->crypto.pki_session_encoded = get_memory(size);
+
+ /* Encode session data */
+ if (!crypto_session_encode(jcr->crypto.pki_session, (uint8_t *)jcr->crypto.pki_session_encoded, &size)) {
+ Jmsg(jcr, M_FATAL, 0, _("An error occurred while encrypting the stream.\n"));
+ return false;
+ }
+
+ /* ... and store the encoded size */
+ jcr->crypto.pki_session_encoded_size = size;
+
+ /* Allocate the encryption/decryption buffer */
+ jcr->crypto.crypto_buf = get_memory(CRYPTO_CIPHER_MAX_BLOCK_SIZE);
+ }
+ return true;
+}
+
+static void crypto_session_end(JCR *jcr)
+{
+ if (jcr->crypto.crypto_buf) {
+ free_pool_memory(jcr->crypto.crypto_buf);
+ jcr->crypto.crypto_buf = NULL;
+ }
+ if (jcr->crypto.pki_session) {
+ crypto_session_free(jcr->crypto.pki_session);
+ }
+ if (jcr->crypto.pki_session_encoded) {
+ free_pool_memory(jcr->crypto.pki_session_encoded);
+ jcr->crypto.pki_session_encoded = NULL;
+ }
+}
+
+static bool crypto_session_send(JCR *jcr, BSOCK *sd)
+{
+ POOLMEM *msgsave;
+
+ /* Send our header */
+ Dmsg2(100, "Send hdr fi=%ld stream=%d\n", jcr->JobFiles, STREAM_ENCRYPTED_SESSION_DATA);
+ sd->fsend("%ld %d 0", jcr->JobFiles, STREAM_ENCRYPTED_SESSION_DATA);
+
+ msgsave = sd->msg;
+ sd->msg = jcr->crypto.pki_session_encoded;
+ sd->msglen = jcr->crypto.pki_session_encoded_size;
+ jcr->JobBytes += sd->msglen;
+
+ Dmsg1(100, "Send data len=%d\n", sd->msglen);
+ sd->send();
+ sd->msg = msgsave;
+ sd->signal(BNET_EOD);
+ return true;
+}
+
+
+/*
* Called here by find() for each file included.
- *
- * *****FIXME***** add FSMs File System Modules
+ * This is a callback. The original is find_files() above.
*
* Send the file and its data to the Storage daemon.
*
* Returns: 1 if OK
- * 0 if error
- * -1 to ignore file/directory (not used here)
+ * 0 if error
+ * -1 to ignore file/directory (not used here)
*/
-static int save_file(FF_PKT *ff_pkt, void *vjcr)
+int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
{
- char attribs[MAXSTRING];
- char attribsEx[MAXSTRING];
- int stat, attr_stream, data_stream;
- bool hfsplus = false;
- struct MD5Context md5c;
- struct SHA1Context sha1c;
- int gotMD5 = 0;
- int gotSHA1 = 0;
- unsigned char signature[30]; /* large enough for either signature */
- BSOCK *sd;
- JCR *jcr = (JCR *)vjcr;
- POOLMEM *msgsave;
+ bool do_read = false;
+ int stat, data_stream;
+ int rtnstat = 0;
+ DIGEST *digest = NULL;
+ DIGEST *signing_digest = NULL;
+ int digest_stream = STREAM_NONE;
+ SIGNATURE *sig = NULL;
+ bool has_file_data = false;
+ // TODO landonf: Allow the user to specify the digest algorithm
+#ifdef HAVE_SHA2
+ crypto_digest_t signing_algorithm = CRYPTO_DIGEST_SHA256;
+#else
+ crypto_digest_t signing_algorithm = CRYPTO_DIGEST_SHA1;
+#endif
+ BSOCK *sd = jcr->store_bsock;
if (job_canceled(jcr)) {
return 0;
}
- sd = jcr->store_bsock;
- jcr->num_files_examined++; /* bump total file count */
+ jcr->num_files_examined++; /* bump total file count */
switch (ff_pkt->type) {
- case FT_LNKSAVED: /* Hard linked, file already saved */
+ case FT_LNKSAVED: /* Hard linked, file already saved */
Dmsg2(130, "FT_LNKSAVED hard link: %s => %s\n", ff_pkt->fname, ff_pkt->link);
break;
case FT_REGE:
Dmsg1(130, "FT_REGE saving: %s\n", ff_pkt->fname);
+ has_file_data = true;
break;
case FT_REG:
Dmsg1(130, "FT_REG saving: %s\n", ff_pkt->fname);
+ has_file_data = true;
break;
case FT_LNK:
Dmsg2(130, "FT_LNK saving: %s -> %s\n", ff_pkt->fname, ff_pkt->link);
break;
case FT_DIRBEGIN:
- return 1; /* not used */
+ jcr->num_files_examined--; /* correct file count */
+ return 1; /* not used */
case FT_NORECURSE:
+ Jmsg(jcr, M_INFO, 1, _(" Recursion turned off. Will not descend from %s into %s\n"),
+ ff_pkt->top_fname, ff_pkt->fname);
+ ff_pkt->type = FT_DIREND; /* Backup only the directory entry */
+ break;
case FT_NOFSCHG:
+ /* Suppress message for /dev filesystems */
+ if (strncmp(ff_pkt->fname, "/dev/", 5) != 0) {
+ Jmsg(jcr, M_INFO, 1, _(" %s is a different filesystem. Will not descend from %s into %s\n"),
+ ff_pkt->fname, ff_pkt->top_fname, ff_pkt->fname);
+ }
+ ff_pkt->type = FT_DIREND; /* Backup only the directory entry */
+ break;
case FT_INVALIDFS:
+ Jmsg(jcr, M_INFO, 1, _(" Disallowed filesystem. Will not descend from %s into %s\n"),
+ ff_pkt->top_fname, ff_pkt->fname);
+ ff_pkt->type = FT_DIREND; /* Backup only the directory entry */
+ break;
+ case FT_INVALIDDT:
+ Jmsg(jcr, M_INFO, 1, _(" Disallowed drive type. Will not descend into %s\n"),
+ ff_pkt->fname);
+ break;
+ case FT_REPARSE:
case FT_DIREND:
- if (ff_pkt->type == FT_NORECURSE) {
- Jmsg(jcr, M_INFO, 1, _(" Recursion turned off. Will not descend into %s\n"),
- ff_pkt->fname);
- } else if (ff_pkt->type == FT_NOFSCHG) {
- Jmsg(jcr, M_INFO, 1, _(" File system change prohibited. Will not descend into %s\n"),
- ff_pkt->fname);
- } else if (ff_pkt->type == FT_INVALIDFS) {
- Jmsg(jcr, M_INFO, 1, _(" Disallowed filesystem. Will not descend into %s\n"),
- ff_pkt->fname);
- }
- ff_pkt->type = FT_DIREND; /* value is used below */
- Dmsg1(130, "FT_DIR saving: %s\n", ff_pkt->link);
+ Dmsg1(130, "FT_DIREND: %s\n", ff_pkt->link);
break;
case FT_SPEC:
Dmsg1(130, "FT_SPEC saving: %s\n", ff_pkt->fname);
+ if (S_ISSOCK(ff_pkt->statp.st_mode)) {
+ Jmsg(jcr, M_SKIPPED, 1, _(" Socket file skipped: %s\n"), ff_pkt->fname);
+ return 1;
+ }
break;
case FT_RAW:
Dmsg1(130, "FT_RAW saving: %s\n", ff_pkt->fname);
+ has_file_data = true;
break;
case FT_FIFO:
Dmsg1(130, "FT_FIFO saving: %s\n", ff_pkt->fname);
break;
case FT_NOACCESS: {
berrno be;
- be.set_errno(ff_pkt->ff_errno);
- Jmsg(jcr, M_NOTSAVED, 0, _(" Could not access %s: ERR=%s\n"), ff_pkt->fname,
- be.strerror());
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Could not access %s: ERR=%s\n"), ff_pkt->fname,
+ be.bstrerror(ff_pkt->ff_errno));
jcr->Errors++;
return 1;
}
case FT_NOFOLLOW: {
berrno be;
- be.set_errno(ff_pkt->ff_errno);
- Jmsg(jcr, M_NOTSAVED, 0, _(" Could not follow link %s: ERR=%s\n"), ff_pkt->fname,
- be.strerror());
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Could not follow link %s: ERR=%s\n"),
+ ff_pkt->fname, be.bstrerror(ff_pkt->ff_errno));
jcr->Errors++;
return 1;
}
case FT_NOSTAT: {
berrno be;
- be.set_errno(ff_pkt->ff_errno);
- Jmsg(jcr, M_NOTSAVED, 0, _(" Could not stat %s: ERR=%s\n"), ff_pkt->fname,
- be.strerror());
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Could not stat %s: ERR=%s\n"), ff_pkt->fname,
+ be.bstrerror(ff_pkt->ff_errno));
jcr->Errors++;
return 1;
}
return 1;
case FT_NOOPEN: {
berrno be;
- be.set_errno(ff_pkt->ff_errno);
- Jmsg(jcr, M_NOTSAVED, 0, _(" Could not open directory %s: ERR=%s\n"), ff_pkt->fname,
- be.strerror());
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Could not open directory %s: ERR=%s\n"),
+ ff_pkt->fname, be.bstrerror(ff_pkt->ff_errno));
jcr->Errors++;
return 1;
}
default:
- Jmsg(jcr, M_NOTSAVED, 0, _(" Unknown file type %d; not saved: %s\n"), ff_pkt->type, ff_pkt->fname);
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Unknown file type %d; not saved: %s\n"),
+ ff_pkt->type, ff_pkt->fname);
jcr->Errors++;
return 1;
}
+ Dmsg1(130, "bfiled: sending %s to stored\n", ff_pkt->fname);
+
+ /* Digests and encryption are only useful if there's file data */
+ if (has_file_data) {
+ /*
+ * Setup for digest handling. If this fails, the digest will be set to NULL
+ * and not used. Note, the digest (file hash) can be any one of the four
+ * algorithms below.
+ *
+ * The signing digest is a single algorithm depending on
+ * whether or not we have SHA2.
+ * ****FIXME**** the signing algoritm should really be
+ * determined a different way!!!!!! What happens if
+ * sha2 was available during backup but not restore?
+ */
+ if (ff_pkt->flags & FO_MD5) {
+ digest = crypto_digest_new(jcr, CRYPTO_DIGEST_MD5);
+ digest_stream = STREAM_MD5_DIGEST;
+
+ } else if (ff_pkt->flags & FO_SHA1) {
+ digest = crypto_digest_new(jcr, CRYPTO_DIGEST_SHA1);
+ digest_stream = STREAM_SHA1_DIGEST;
+
+ } else if (ff_pkt->flags & FO_SHA256) {
+ digest = crypto_digest_new(jcr, CRYPTO_DIGEST_SHA256);
+ digest_stream = STREAM_SHA256_DIGEST;
+
+ } else if (ff_pkt->flags & FO_SHA512) {
+ digest = crypto_digest_new(jcr, CRYPTO_DIGEST_SHA512);
+ digest_stream = STREAM_SHA512_DIGEST;
+ }
+
+ /* Did digest initialization fail? */
+ if (digest_stream != STREAM_NONE && digest == NULL) {
+ Jmsg(jcr, M_WARNING, 0, _("%s digest initialization failed\n"),
+ stream_to_ascii(digest_stream));
+ }
+
+ /*
+ * Set up signature digest handling. If this fails, the signature digest will be set to
+ * NULL and not used.
+ */
+ // TODO landonf: We should really only calculate the digest once, for both verification and signing.
+ if (jcr->crypto.pki_sign) {
+ signing_digest = crypto_digest_new(jcr, signing_algorithm);
+
+ /* Full-stop if a failure occurred initializing the signature digest */
+ if (signing_digest == NULL) {
+ Jmsg(jcr, M_NOTSAVED, 0, _("%s signature digest initialization failed\n"),
+ stream_to_ascii(signing_algorithm));
+ jcr->Errors++;
+ goto good_rtn;
+ }
+ }
+
+ /* Enable encryption */
+ if (jcr->crypto.pki_encrypt) {
+ ff_pkt->flags |= FO_ENCRYPT;
+ }
+ }
+
+ /* Initialize the file descriptor we use for data and other streams. */
binit(&ff_pkt->bfd);
if (ff_pkt->flags & FO_PORTABLE) {
set_portable_backup(&ff_pkt->bfd); /* disable Win32 BackupRead() */
}
- if (ff_pkt->reader) {
- set_prog(&ff_pkt->bfd, ff_pkt->reader, jcr);
+ if (ff_pkt->cmd_plugin) {
+ if (!set_cmd_plugin(&ff_pkt->bfd, jcr)) {
+ goto bail_out;
+ }
+ send_plugin_name(jcr, sd, true); /* signal start of plugin data */
}
- /*
- * Open any file with data that we intend to save.
+ /* Send attributes -- must be done after binit() */
+ if (!encode_and_send_attributes(jcr, ff_pkt, data_stream)) {
+ goto bail_out;
+ }
+
+ /* Set up the encryption context and send the session data to the SD */
+ if (has_file_data && jcr->crypto.pki_encrypt) {
+ if (!crypto_session_send(jcr, sd)) {
+ goto bail_out;
+ }
+ }
+
+ /*
+ * Open any file with data that we intend to save, then save it.
+ *
* Note, if is_win32_backup, we must open the Directory so that
* the BackupRead will save its permissions and ownership streams.
*/
- if (ff_pkt->type != FT_LNKSAVED && (S_ISREG(ff_pkt->statp.st_mode) &&
- ff_pkt->statp.st_size > 0) ||
- ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO ||
- (!is_portable_backup(&ff_pkt->bfd) && ff_pkt->type == FT_DIREND)) {
- btimer_t *tid;
+ if (ff_pkt->type != FT_LNKSAVED && S_ISREG(ff_pkt->statp.st_mode)) {
+#ifdef HAVE_WIN32
+ do_read = !is_portable_backup(&ff_pkt->bfd) || ff_pkt->statp.st_size > 0;
+#else
+ do_read = ff_pkt->statp.st_size > 0;
+#endif
+ } else if (ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO ||
+ ff_pkt->type == FT_REPARSE ||
+ (!is_portable_backup(&ff_pkt->bfd) && ff_pkt->type == FT_DIREND)) {
+ do_read = true;
+ }
+ if (ff_pkt->cmd_plugin) {
+ do_read = true;
+ }
+
+ Dmsg1(100, "do_read=%d\n", do_read);
+ if (do_read) {
+ btimer_t *tid;
+
if (ff_pkt->type == FT_FIFO) {
- tid = start_thread_timer(pthread_self(), 60);
+ tid = start_thread_timer(jcr, pthread_self(), 60);
} else {
- tid = NULL;
- }
- if (bopen(&ff_pkt->bfd, ff_pkt->fname, O_RDONLY | O_BINARY, 0) < 0) {
- ff_pkt->ff_errno = errno;
- berrno be;
- Jmsg(jcr, M_NOTSAVED, 0, _(" Cannot open %s: ERR=%s.\n"), ff_pkt->fname,
- be.strerror());
- jcr->Errors++;
- if (tid) {
- stop_thread_timer(tid);
- tid = NULL;
- }
- return 1;
+ tid = NULL;
+ }
+ int noatime = ff_pkt->flags & FO_NOATIME ? O_NOATIME : 0;
+ ff_pkt->bfd.reparse_point = ff_pkt->type == FT_REPARSE;
+ if (bopen(&ff_pkt->bfd, ff_pkt->fname, O_RDONLY | O_BINARY | noatime, 0) < 0) {
+ ff_pkt->ff_errno = errno;
+ berrno be;
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Cannot open %s: ERR=%s.\n"), ff_pkt->fname,
+ be.bstrerror());
+ jcr->Errors++;
+ if (tid) {
+ stop_thread_timer(tid);
+ tid = NULL;
+ }
+ goto good_rtn;
}
if (tid) {
- stop_thread_timer(tid);
- tid = NULL;
+ stop_thread_timer(tid);
+ tid = NULL;
+ }
+
+ stat = send_data(jcr, data_stream, ff_pkt, digest, signing_digest);
+
+ if (ff_pkt->flags & FO_CHKCHANGES) {
+ has_file_changed(jcr, ff_pkt);
+ }
+
+ bclose(&ff_pkt->bfd);
+
+ if (!stat) {
+ goto bail_out;
}
}
- binit(&ff_pkt->rsrc_bfd);
#ifdef HAVE_DARWIN_OS
- /* Open resource fork if necessary */
+ /* Regular files can have resource forks and Finder Info */
if (ff_pkt->type != FT_LNKSAVED && (S_ISREG(ff_pkt->statp.st_mode) &&
ff_pkt->flags & FO_HFSPLUS)) {
- /* Remember Finder Info, whether we have data or fork, or not */
- hfsplus = true;
if (ff_pkt->hfsinfo.rsrclength > 0) {
- if (!bopen_rsrc(&ff_pkt->rsrc_bfd, ff_pkt->fname, O_RDONLY | O_BINARY, 0) < 0) {
- ff_pkt->ff_errno = errno;
- berrno be;
- Jmsg(jcr, M_NOTSAVED, -1, _(" Cannot open resource fork for %s: ERR=%s.\n"), ff_pkt->fname,
- be.strerror());
+ int flags;
+ int rsrc_stream;
+ if (!bopen_rsrc(&ff_pkt->bfd, ff_pkt->fname, O_RDONLY | O_BINARY, 0) < 0) {
+ ff_pkt->ff_errno = errno;
+ berrno be;
+ Jmsg(jcr, M_NOTSAVED, -1, _(" Cannot open resource fork for %s: ERR=%s.\n"),
+ ff_pkt->fname, be.bstrerror());
jcr->Errors++;
if (is_bopen(&ff_pkt->bfd)) {
bclose(&ff_pkt->bfd);
}
- return 1;
+ goto good_rtn;
+ }
+ flags = ff_pkt->flags;
+ ff_pkt->flags &= ~(FO_GZIP|FO_SPARSE);
+ if (flags & FO_ENCRYPT) {
+ rsrc_stream = STREAM_ENCRYPTED_MACOS_FORK_DATA;
+ } else {
+ rsrc_stream = STREAM_MACOS_FORK_DATA;
+ }
+ stat = send_data(jcr, rsrc_stream, ff_pkt, digest, signing_digest);
+ ff_pkt->flags = flags;
+ bclose(&ff_pkt->bfd);
+ if (!stat) {
+ goto bail_out;
}
}
+
+ Dmsg1(300, "Saving Finder Info for \"%s\"\n", ff_pkt->fname);
+ sd->fsend("%ld %d 0", jcr->JobFiles, STREAM_HFSPLUS_ATTRIBUTES);
+ Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
+ memcpy(sd->msg, ff_pkt->hfsinfo.fndrinfo, 32);
+ sd->msglen = 32;
+ if (digest) {
+ crypto_digest_update(digest, (uint8_t *)sd->msg, sd->msglen);
+ }
+ if (signing_digest) {
+ crypto_digest_update(signing_digest, (uint8_t *)sd->msg, sd->msglen);
+ }
+ sd->send();
+ sd->signal(BNET_EOD);
}
#endif
- Dmsg1(130, "bfiled: sending %s to stored\n", ff_pkt->fname);
-
- /* Find what data stream we will use, then encode the attributes */
- data_stream = select_data_stream(ff_pkt);
- encode_stat(attribs, ff_pkt, data_stream);
+ if (ff_pkt->flags & FO_ACL) {
+ /* Read access ACLs for files, dirs and links */
+ if (!read_and_send_acl(jcr, BACL_TYPE_ACCESS, STREAM_UNIX_ACCESS_ACL)) {
+ goto bail_out;
+ }
+ /* Directories can have default ACLs too */
+ if (ff_pkt->type == FT_DIREND && (BACL_CAP & BACL_CAP_DEFAULTS_DIR)) {
+ if (!read_and_send_acl(jcr, BACL_TYPE_DEFAULT, STREAM_UNIX_DEFAULT_ACL)) {
+ goto bail_out;
+ }
+ }
+ }
- /* Now possibly extend the attributes */
- attr_stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
+ /* Terminate the signing digest and send it to the Storage daemon */
+ if (signing_digest) {
+ uint32_t size = 0;
- Dmsg3(300, "File %s\nattribs=%s\nattribsEx=%s\n", ff_pkt->fname, attribs, attribsEx);
-
- P(jcr->mutex);
- jcr->JobFiles++; /* increment number of files sent */
- ff_pkt->FileIndex = jcr->JobFiles; /* return FileIndex */
- pm_strcpy(jcr->last_fname, ff_pkt->fname);
- V(jcr->mutex);
-
- /*
- * Send Attributes header to Storage daemon
- * <file-index> <stream> <info>
- */
- if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, attr_stream)) {
- berrno be;
- if (is_bopen(&ff_pkt->bfd)) {
- bclose(&ff_pkt->bfd);
+ if ((sig = crypto_sign_new(jcr)) == NULL) {
+ Jmsg(jcr, M_FATAL, 0, _("Failed to allocate memory for crypto signature.\n"));
+ goto bail_out;
}
- if (is_bopen(&ff_pkt->rsrc_bfd)) {
- bclose(&ff_pkt->rsrc_bfd);
+
+ if (!crypto_sign_add_signer(sig, signing_digest, jcr->crypto.pki_keypair)) {
+ Jmsg(jcr, M_FATAL, 0, _("An error occurred while signing the stream.\n"));
+ goto bail_out;
}
- Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- bnet_strerror(sd));
- return 0;
- }
- Dmsg1(300, ">stored: attrhdr %s\n", sd->msg);
- /*
- * Send file attributes to Storage daemon
- * File_index
- * File type
- * Filename (full path)
- * Encoded attributes
- * Link name (if type==FT_LNK or FT_LNKSAVED)
- * Encoded extended-attributes (for Win32)
- *
- * For a directory, link is the same as fname, but with trailing
- * slash. For a linked file, link is the link.
- */
- if (ff_pkt->type == FT_LNK || ff_pkt->type == FT_LNKSAVED) {
- Dmsg2(300, "Link %s to %s\n", ff_pkt->fname, ff_pkt->link);
- stat = bnet_fsend(sd, "%ld %d %s%c%s%c%s%c%s%c", jcr->JobFiles,
- ff_pkt->type, ff_pkt->fname, 0, attribs, 0, ff_pkt->link, 0,
- attribsEx, 0);
- } else if (ff_pkt->type == FT_DIREND) {
- /* Here link is the canonical filename (i.e. with trailing slash) */
- stat = bnet_fsend(sd, "%ld %d %s%c%s%c%c%s%c", jcr->JobFiles,
- ff_pkt->type, ff_pkt->link, 0, attribs, 0, 0, attribsEx, 0);
- } else {
- stat = bnet_fsend(sd, "%ld %d %s%c%s%c%c%s%c", jcr->JobFiles,
- ff_pkt->type, ff_pkt->fname, 0, attribs, 0, 0, attribsEx, 0);
- }
+ /* Get signature size */
+ if (!crypto_sign_encode(sig, NULL, &size)) {
+ Jmsg(jcr, M_FATAL, 0, _("An error occurred while signing the stream.\n"));
+ goto bail_out;
+ }
- Dmsg2(300, ">stored: attr len=%d: %s\n", sd->msglen, sd->msg);
- if (!stat) {
- berrno be;
- if (is_bopen(&ff_pkt->bfd)) {
- bclose(&ff_pkt->bfd);
+ /* Grow the bsock buffer to fit our message if necessary */
+ if (sizeof_pool_memory(sd->msg) < (int32_t)size) {
+ sd->msg = realloc_pool_memory(sd->msg, size);
}
- if (is_bopen(&ff_pkt->rsrc_bfd)) {
- bclose(&ff_pkt->rsrc_bfd);
+
+ /* Send our header */
+ sd->fsend("%ld %d 0", jcr->JobFiles, STREAM_SIGNED_DIGEST);
+ Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
+
+ /* Encode signature data */
+ if (!crypto_sign_encode(sig, (uint8_t *)sd->msg, &size)) {
+ Jmsg(jcr, M_FATAL, 0, _("An error occurred while signing the stream.\n"));
+ goto bail_out;
}
- Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- bnet_strerror(sd));
- return 0;
+
+ sd->msglen = size;
+ sd->send();
+ sd->signal(BNET_EOD); /* end of checksum */
}
- bnet_sig(sd, BNET_EOD); /* indicate end of attributes data */
- if (is_bopen(&ff_pkt->bfd) || hfsplus) {
- if (ff_pkt->flags & FO_MD5) {
- MD5Init(&md5c);
- } else if (ff_pkt->flags & FO_SHA1) {
- SHA1Init(&sha1c);
+ /* Terminate any digest and send it to Storage daemon */
+ if (digest) {
+ uint32_t size;
+
+ sd->fsend("%ld %d 0", jcr->JobFiles, digest_stream);
+ Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
+
+ size = CRYPTO_DIGEST_MAX_SIZE;
+
+ /* Grow the bsock buffer to fit our message if necessary */
+ if (sizeof_pool_memory(sd->msg) < (int32_t)size) {
+ sd->msg = realloc_pool_memory(sd->msg, size);
}
+
+ if (!crypto_digest_finalize(digest, (uint8_t *)sd->msg, &size)) {
+ Jmsg(jcr, M_FATAL, 0, _("An error occurred finalizing signing the stream.\n"));
+ goto bail_out;
+ }
+
+ sd->msglen = size;
+ sd->send();
+ sd->signal(BNET_EOD); /* end of checksum */
+ }
+ if (ff_pkt->cmd_plugin) {
+ send_plugin_name(jcr, sd, false); /* signal end of plugin data */
}
- /*
- * If the file has data, read it and send to the Storage daemon
- *
- */
- if (is_bopen(&ff_pkt->bfd)) {
- uint64_t fileAddr = 0; /* file address */
- char *rbuf, *wbuf;
- int rsize = jcr->buf_size; /* read buffer size */
+good_rtn:
+ rtnstat = 1; /* good return */
- msgsave = sd->msg;
- rbuf = sd->msg; /* read buffer */
- wbuf = sd->msg; /* write buffer */
+bail_out:
+ if (digest) {
+ crypto_digest_free(digest);
+ }
+ if (signing_digest) {
+ crypto_digest_free(signing_digest);
+ }
+ if (sig) {
+ crypto_sign_free(sig);
+ }
+ return rtnstat;
+}
+/*
+ * Send data read from an already open file descriptor.
+ *
+ * We return 1 on sucess and 0 on errors.
+ *
+ * ***FIXME***
+ * We use ff_pkt->statp.st_size when FO_SPARSE to know when to stop
+ * reading.
+ * Currently this is not a problem as the only other stream, resource forks,
+ * are not handled as sparse files.
+ */
+int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, DIGEST *digest,
+ DIGEST *signing_digest)
+{
+ BSOCK *sd = jcr->store_bsock;
+ uint64_t fileAddr = 0; /* file address */
+ char *rbuf, *wbuf;
+ int32_t rsize = jcr->buf_size; /* read buffer size */
+ POOLMEM *msgsave;
+ CIPHER_CONTEXT *cipher_ctx = NULL; /* Quell bogus uninitialized warnings */
+ const uint8_t *cipher_input;
+ uint32_t cipher_input_len;
+ uint32_t cipher_block_size;
+ uint32_t encrypted_len;
+#ifdef FD_NO_SEND_TEST
+ return 1;
+#endif
- Dmsg1(300, "Saving data, type=%d\n", ff_pkt->type);
+ msgsave = sd->msg;
+ rbuf = sd->msg; /* read buffer */
+ wbuf = sd->msg; /* write buffer */
+ cipher_input = (uint8_t *)rbuf; /* encrypt uncompressed data */
+ Dmsg1(300, "Saving data, type=%d\n", ff_pkt->type);
#ifdef HAVE_LIBZ
- uLong compress_len, max_compress_len = 0;
- const Bytef *cbuf = NULL;
-
- if (ff_pkt->flags & FO_GZIP) {
- if (ff_pkt->flags & FO_SPARSE) {
- cbuf = (Bytef *)jcr->compress_buf + SPARSE_FADDR_SIZE;
- max_compress_len = jcr->compress_buf_size - SPARSE_FADDR_SIZE;
- } else {
- cbuf = (Bytef *)jcr->compress_buf;
- max_compress_len = jcr->compress_buf_size; /* set max length */
- }
- wbuf = jcr->compress_buf; /* compressed output here */
+ uLong compress_len = 0;
+ uLong max_compress_len = 0;
+ const Bytef *cbuf = NULL;
+ int zstat;
+
+ if (ff_pkt->flags & FO_GZIP) {
+ if (ff_pkt->flags & FO_SPARSE) {
+ cbuf = (Bytef *)jcr->compress_buf + SPARSE_FADDR_SIZE;
+ max_compress_len = jcr->compress_buf_size - SPARSE_FADDR_SIZE;
+ } else {
+ cbuf = (Bytef *)jcr->compress_buf;
+ max_compress_len = jcr->compress_buf_size; /* set max length */
}
-#endif
+ wbuf = jcr->compress_buf; /* compressed output here */
+ cipher_input = (uint8_t *)jcr->compress_buf; /* encrypt compressed data */
- /*
- * Send Data header to Storage daemon
- * <file-index> <stream> <info>
+ /*
+ * Only change zlib parameters if there is no pending operation.
+ * This should never happen as deflatereset is called after each
+ * deflate.
*/
- if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, data_stream)) {
- berrno be;
- bclose(&ff_pkt->bfd);
- if (is_bopen(&ff_pkt->rsrc_bfd)) {
- bclose(&ff_pkt->rsrc_bfd);
- }
- Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- bnet_strerror(sd));
- return 0;
+
+ if (((z_stream*)jcr->pZLIB_compress_workset)->total_in == 0) {
+ /* set gzip compression level - must be done per file */
+ if ((zstat=deflateParams((z_stream*)jcr->pZLIB_compress_workset,
+ ff_pkt->GZIP_level, Z_DEFAULT_STRATEGY)) != Z_OK) {
+ Jmsg(jcr, M_FATAL, 0, _("Compression deflateParams error: %d\n"), zstat);
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ goto err;
+ }
}
- Dmsg1(300, ">stored: datahdr %s\n", sd->msg);
+ }
+#else
+ const uint32_t max_compress_len = 0;
+#endif
- /*
- * Make space at beginning of buffer for fileAddr because this
- * same buffer will be used for writing if compression if off.
- */
+ if (ff_pkt->flags & FO_ENCRYPT) {
if (ff_pkt->flags & FO_SPARSE) {
- rbuf += SPARSE_FADDR_SIZE;
- rsize -= SPARSE_FADDR_SIZE;
-#ifdef HAVE_FREEBSD_OS
- /*
- * To read FreeBSD partitions, the read size must be
- * a multiple of 512.
- */
- rsize = (rsize/512) * 512;
-#endif
+ Jmsg0(jcr, M_FATAL, 0, _("Encrypting sparse data not supported.\n"));
+ goto err;
+ }
+ /* Allocate the cipher context */
+ if ((cipher_ctx = crypto_cipher_new(jcr->crypto.pki_session, true,
+ &cipher_block_size)) == NULL) {
+ /* Shouldn't happen! */
+ Jmsg0(jcr, M_FATAL, 0, _("Failed to initialize encryption context.\n"));
+ goto err;
}
- /*
- * Read the file data
+ /*
+ * Grow the crypto buffer, if necessary.
+ * crypto_cipher_update() will buffer up to (cipher_block_size - 1).
+ * We grow crypto_buf to the maximum number of blocks that
+ * could be returned for the given read buffer size.
+ * (Using the larger of either rsize or max_compress_len)
*/
- while ((sd->msglen=(uint32_t)bread(&ff_pkt->bfd, rbuf, rsize)) > 0) {
- int sparseBlock = 0;
-
- /* Check for sparse blocks */
- if (ff_pkt->flags & FO_SPARSE) {
- ser_declare;
- if (sd->msglen == rsize &&
- (fileAddr+sd->msglen < (uint64_t)ff_pkt->statp.st_size)) {
- sparseBlock = is_buf_zero(rbuf, rsize);
- }
-
- ser_begin(wbuf, SPARSE_FADDR_SIZE);
- ser_uint64(fileAddr); /* store fileAddr in begin of buffer */
- }
-
- jcr->ReadBytes += sd->msglen; /* count bytes read */
- fileAddr += sd->msglen;
-
- /* Update MD5 if requested */
- if (ff_pkt->flags & FO_MD5) {
- MD5Update(&md5c, (unsigned char *)rbuf, sd->msglen);
- gotMD5 = 1;
- } else if (ff_pkt->flags & FO_SHA1) {
- SHA1Update(&sha1c, (unsigned char *)rbuf, sd->msglen);
- gotSHA1 = 1;
- }
+ jcr->crypto.crypto_buf = check_pool_memory_size(jcr->crypto.crypto_buf,
+ (MAX(rsize + (int)sizeof(uint32_t), (int32_t)max_compress_len) +
+ cipher_block_size - 1) / cipher_block_size * cipher_block_size);
-#ifdef HAVE_LIBZ
- /* Do compression if turned on */
- if (!sparseBlock && ff_pkt->flags & FO_GZIP) {
- int zstat;
- compress_len = max_compress_len;
- Dmsg4(400, "cbuf=0x%x len=%u rbuf=0x%x len=%u\n", cbuf, compress_len,
- rbuf, sd->msglen);
- /* NOTE! This call modifies compress_len !!! */
- if ((zstat=compress2((Bytef *)cbuf, &compress_len,
- (const Bytef *)rbuf, (uLong)sd->msglen,
- ff_pkt->GZIP_level)) != Z_OK) {
- Jmsg(jcr, M_FATAL, 0, _("Compression error: %d\n"), zstat);
- sd->msg = msgsave;
- sd->msglen = 0;
- bclose(&ff_pkt->bfd);
- if (is_bopen(&ff_pkt->rsrc_bfd)) {
- bclose(&ff_pkt->rsrc_bfd);
- }
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
- }
- Dmsg2(400, "compressed len=%d uncompressed len=%d\n",
- compress_len, sd->msglen);
-
- sd->msglen = compress_len; /* set compressed length */
- }
+ wbuf = jcr->crypto.crypto_buf; /* Encrypted, possibly compressed output here. */
+ }
+
+ /*
+ * Send Data header to Storage daemon
+ * <file-index> <stream> <info>
+ */
+ if (!sd->fsend("%ld %d 0", jcr->JobFiles, stream)) {
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ sd->bstrerror());
+ goto err;
+ }
+ Dmsg1(300, ">stored: datahdr %s\n", sd->msg);
+
+ /*
+ * Make space at beginning of buffer for fileAddr because this
+ * same buffer will be used for writing if compression is off.
+ */
+ if (ff_pkt->flags & FO_SPARSE) {
+ rbuf += SPARSE_FADDR_SIZE;
+ rsize -= SPARSE_FADDR_SIZE;
+#ifdef HAVE_FREEBSD_OS
+ /*
+ * To read FreeBSD partitions, the read size must be
+ * a multiple of 512.
+ */
+ rsize = (rsize/512) * 512;
#endif
+ }
- /* Send the buffer to the Storage daemon */
- if (!sparseBlock) {
- if (ff_pkt->flags & FO_SPARSE) {
- sd->msglen += SPARSE_FADDR_SIZE; /* include fileAddr in size */
- }
- sd->msg = wbuf; /* set correct write buffer */
- if (!bnet_send(sd)) {
- berrno be;
- Jmsg2(jcr, M_FATAL, 0, _("Network send error %d to SD. ERR=%s\n"),
- sd->msglen, bnet_strerror(sd));
- sd->msg = msgsave; /* restore bnet buffer */
- sd->msglen = 0;
- bclose(&ff_pkt->bfd);
- if (is_bopen(&ff_pkt->rsrc_bfd)) {
- bclose(&ff_pkt->rsrc_bfd);
- }
- return 0;
- }
- }
- Dmsg1(130, "Send data to SD len=%d\n", sd->msglen);
- /* #endif */
- jcr->JobBytes += sd->msglen; /* count bytes saved possibly compressed */
- sd->msg = msgsave; /* restore read buffer */
+ /* a RAW device read on win32 only works if the buffer is a multiple of 512 */
+#ifdef HAVE_WIN32
+ if (S_ISBLK(ff_pkt->statp.st_mode))
+ rsize = (rsize/512) * 512;
+#endif
+
+ /*
+ * Read the file data
+ */
+ while ((sd->msglen=(uint32_t)bread(&ff_pkt->bfd, rbuf, rsize)) > 0) {
+
+ /* Check for sparse blocks */
+ if (ff_pkt->flags & FO_SPARSE) {
+ ser_declare;
+ bool haveBlock = true;
+ if (sd->msglen == rsize &&
+ fileAddr+sd->msglen < (uint64_t)ff_pkt->statp.st_size ||
+ ((ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO) &&
+ (uint64_t)ff_pkt->statp.st_size == 0)) {
+ haveBlock = !is_buf_zero(rbuf, rsize);
+ }
+ if (haveBlock) {
+ ser_begin(wbuf, SPARSE_FADDR_SIZE);
+ ser_uint64(fileAddr); /* store fileAddr in begin of buffer */
+ }
+ fileAddr += sd->msglen; /* update file address */
+ if (!haveBlock) {
+ continue; /* skip block of zeros */
+ }
+ }
- } /* end while read file data */
+ jcr->ReadBytes += sd->msglen; /* count bytes read */
+ /* Uncompressed cipher input length */
+ cipher_input_len = sd->msglen;
- if (sd->msglen < 0) {
- berrno be;
- be.set_errno(ff_pkt->bfd.berrno);
- Jmsg(jcr, M_ERROR, 0, _("Read error on file %s. ERR=%s\n"),
- ff_pkt->fname, be.strerror());
+ /* Update checksum if requested */
+ if (digest) {
+ crypto_digest_update(digest, (uint8_t *)rbuf, sd->msglen);
}
- bclose(&ff_pkt->bfd); /* close file */
- if (!bnet_sig(sd, BNET_EOD)) { /* indicate end of file data */
- berrno be;
- Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- bnet_strerror(sd));
- if (is_bopen(&ff_pkt->rsrc_bfd)) {
- bclose(&ff_pkt->rsrc_bfd);
- }
- return 0;
+ /* Update signing digest if requested */
+ if (signing_digest) {
+ crypto_digest_update(signing_digest, (uint8_t *)rbuf, sd->msglen);
}
- }
-#ifdef HAVE_DARWIN_OS
- /*
- * If resource fork has data, read it and send to the Storage daemon
- *
- */
- if (is_bopen(&ff_pkt->rsrc_bfd)) {
- uint64_t fileAddr = 0; /* file address */
- int rsize = jcr->buf_size; /* read buffer size */
+#ifdef HAVE_LIBZ
+ /* Do compression if turned on */
+ if (ff_pkt->flags & FO_GZIP && jcr->pZLIB_compress_workset) {
+ Dmsg3(400, "cbuf=0x%x rbuf=0x%x len=%u\n", cbuf, rbuf, sd->msglen);
+
+ ((z_stream*)jcr->pZLIB_compress_workset)->next_in = (Bytef *)rbuf;
+ ((z_stream*)jcr->pZLIB_compress_workset)->avail_in = sd->msglen;
+ ((z_stream*)jcr->pZLIB_compress_workset)->next_out = (Bytef *)cbuf;
+ ((z_stream*)jcr->pZLIB_compress_workset)->avail_out = max_compress_len;
+
+ if ((zstat=deflate((z_stream*)jcr->pZLIB_compress_workset, Z_FINISH)) != Z_STREAM_END) {
+ Jmsg(jcr, M_FATAL, 0, _("Compression deflate error: %d\n"), zstat);
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ goto err;
+ }
+ compress_len = ((z_stream*)jcr->pZLIB_compress_workset)->total_out;
+ /* reset zlib stream to be able to begin from scratch again */
+ if ((zstat=deflateReset((z_stream*)jcr->pZLIB_compress_workset)) != Z_OK) {
+ Jmsg(jcr, M_FATAL, 0, _("Compression deflateReset error: %d\n"), zstat);
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ goto err;
+ }
- Dmsg1(300, "Saving resource fork for \"%s\"", ff_pkt->fname);
+ Dmsg2(400, "compressed len=%d uncompressed len=%d\n", compress_len,
+ sd->msglen);
- /*
- * Send Data header to Storage daemon
- * <file-index> <stream> <info>
+ sd->msglen = compress_len; /* set compressed length */
+ cipher_input_len = compress_len;
+ }
+#endif
+ /*
+ * Note, here we prepend the current record length to the beginning
+ * of the encrypted data. This is because both sparse and compression
+ * restore handling want records returned to them with exactly the
+ * same number of bytes that were processed in the backup handling.
+ * That is, both are block filters rather than a stream. When doing
+ * compression, the compression routines may buffer data, so that for
+ * any one record compressed, when it is decompressed the same size
+ * will not be obtained. Of course, the buffered data eventually comes
+ * out in subsequent crypto_cipher_update() calls or at least
+ * when crypto_cipher_finalize() is called. Unfortunately, this
+ * "feature" of encryption enormously complicates the restore code.
*/
- if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_MACOS_FORK_DATA)) {
- berrno be;
- bclose(&ff_pkt->rsrc_bfd);
+ if (ff_pkt->flags & FO_ENCRYPT) {
+ uint32_t initial_len = 0;
+ ser_declare;
+
+ if (ff_pkt->flags & FO_SPARSE) {
+ cipher_input_len += SPARSE_FADDR_SIZE;
+ }
+
+ /* Encrypt the length of the input block */
+ uint8_t packet_len[sizeof(uint32_t)];
+
+ ser_begin(packet_len, sizeof(uint32_t));
+ ser_uint32(cipher_input_len); /* store data len in begin of buffer */
+ Dmsg1(20, "Encrypt len=%d\n", cipher_input_len);
+
+ if (!crypto_cipher_update(cipher_ctx, packet_len, sizeof(packet_len),
+ (uint8_t *)jcr->crypto.crypto_buf, &initial_len)) {
+ /* Encryption failed. Shouldn't happen. */
+ Jmsg(jcr, M_FATAL, 0, _("Encryption error\n"));
+ goto err;
+ }
+
+ /* Encrypt the input block */
+ if (crypto_cipher_update(cipher_ctx, cipher_input, cipher_input_len,
+ (uint8_t *)&jcr->crypto.crypto_buf[initial_len], &encrypted_len)) {
+ if ((initial_len + encrypted_len) == 0) {
+ /* No full block of data available, read more data */
+ continue;
+ }
+ Dmsg2(400, "encrypted len=%d unencrypted len=%d\n", encrypted_len,
+ sd->msglen);
+ sd->msglen = initial_len + encrypted_len; /* set encrypted length */
+ } else {
+ /* Encryption failed. Shouldn't happen. */
+ Jmsg(jcr, M_FATAL, 0, _("Encryption error\n"));
+ goto err;
+ }
+ }
+
+ /* Send the buffer to the Storage daemon */
+ if (ff_pkt->flags & FO_SPARSE) {
+ sd->msglen += SPARSE_FADDR_SIZE; /* include fileAddr in size */
+ }
+ sd->msg = wbuf; /* set correct write buffer */
+ if (!sd->send()) {
Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- bnet_strerror(sd));
- return 0;
+ sd->bstrerror());
+ goto err;
}
- Dmsg1(300, ">stored: datahdr %s\n", sd->msg);
+ Dmsg1(130, "Send data to SD len=%d\n", sd->msglen);
+ /* #endif */
+ jcr->JobBytes += sd->msglen; /* count bytes saved possibly compressed/encrypted */
+ sd->msg = msgsave; /* restore read buffer */
+
+ } /* end while read file data */
+ if (sd->msglen < 0) { /* error */
+ berrno be;
+ Jmsg(jcr, M_ERROR, 0, _("Read error on file %s. ERR=%s\n"),
+ ff_pkt->fname, be.bstrerror(ff_pkt->bfd.berrno));
+ if (jcr->Errors++ > 1000) { /* insanity check */
+ Jmsg(jcr, M_FATAL, 0, _("Too many errors.\n"));
+ }
+ } else if (ff_pkt->flags & FO_ENCRYPT) {
/*
- * Read the resource fork
+ * For encryption, we must call finalize to push out any
+ * buffered data.
*/
- while ((sd->msglen=(uint32_t)bread(&ff_pkt->rsrc_bfd, sd->msg, rsize)) > 0) {
- jcr->ReadBytes += sd->msglen; /* count bytes read */
- fileAddr += sd->msglen;
-
- /* Update MD5 if requested */
- if (ff_pkt->flags & FO_MD5) {
- MD5Update(&md5c, (unsigned char *)sd->msg, sd->msglen);
- gotMD5 = 1;
- } else if (ff_pkt->flags & FO_SHA1) {
- SHA1Update(&sha1c, (unsigned char *)sd->msg, sd->msglen);
- gotSHA1 = 1;
- }
-
- /* Send the buffer to the Storage daemon */
- if (!bnet_send(sd)) {
- berrno be;
- Jmsg2(jcr, M_FATAL, 0, _("Network send error %d to SD. ERR=%s\n"),
- sd->msglen, bnet_strerror(sd));
- sd->msglen = 0;
- bclose(&ff_pkt->rsrc_bfd);
- return 0;
- }
- Dmsg1(130, "Send data to SD len=%d\n", sd->msglen);
- /* #endif */
- jcr->JobBytes += sd->msglen; /* count bytes saved possibly compressed */
- } /* end while read file data */
-
- if (sd->msglen < 0) {
- berrno be;
- be.set_errno(ff_pkt->rsrc_bfd.berrno);
- Jmsg(jcr, M_ERROR, 0, _("Read error on resource fork of %s. ERR=%s\n"),
- ff_pkt->fname, be.strerror());
+ if (!crypto_cipher_finalize(cipher_ctx, (uint8_t *)jcr->crypto.crypto_buf,
+ &encrypted_len)) {
+ /* Padding failed. Shouldn't happen. */
+ Jmsg(jcr, M_FATAL, 0, _("Encryption padding error\n"));
+ goto err;
}
- bclose(&ff_pkt->rsrc_bfd); /* close resource fork */
- if (!bnet_sig(sd, BNET_EOD)) { /* indicate end of resource fork */
- berrno be;
- Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- bnet_strerror(sd));
- return 0;
+ /* Note, on SSL pre-0.9.7, there is always some output */
+ if (encrypted_len > 0) {
+ sd->msglen = encrypted_len; /* set encrypted length */
+ sd->msg = jcr->crypto.crypto_buf; /* set correct write buffer */
+ if (!sd->send()) {
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ sd->bstrerror());
+ goto err;
+ }
+ Dmsg1(130, "Send data to SD len=%d\n", sd->msglen);
+ jcr->JobBytes += sd->msglen; /* count bytes saved possibly compressed/encrypted */
+ sd->msg = msgsave; /* restore bnet buffer */
}
}
+
+ if (!sd->signal(BNET_EOD)) { /* indicate end of file data */
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ sd->bstrerror());
+ goto err;
+ }
+
+ /* Free the cipher context */
+ if (cipher_ctx) {
+ crypto_cipher_free(cipher_ctx);
+ }
+ return 1;
+
+err:
+ /* Free the cipher context */
+ if (cipher_ctx) {
+ crypto_cipher_free(cipher_ctx);
+ }
+
+ sd->msg = msgsave; /* restore bnet buffer */
+ sd->msglen = 0;
+ return 0;
+}
+
+/*
+ * Read and send an ACL for the last encountered file.
+ */
+static bool read_and_send_acl(JCR *jcr, int acltype, int stream)
+{
+#ifdef HAVE_ACL
+ BSOCK *sd = jcr->store_bsock;
+ POOLMEM *msgsave;
+ int len;
+#ifdef FD_NO_SEND_TEST
+ return true;
#endif
-#ifdef HAVE_DARWIN_OS
- /* Handle Finder Info */
- if (S_ISREG(ff_pkt->statp.st_mode) && ff_pkt->flags & FO_HFSPLUS) {
- Dmsg1(300, "Saving Finder Info for \"%s\"", ff_pkt->fname);
- bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_HFSPLUS_ATTRIBUTES);
- Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
- memcpy(sd->msg, ff_pkt->hfsinfo.fndrinfo, 32);
- sd->msglen = 32;
- /* Update MD5 if requested */
- if (ff_pkt->flags & FO_MD5) {
- MD5Update(&md5c, (unsigned char *)sd->msg, sd->msglen);
- gotMD5 = 1;
- } else if (ff_pkt->flags & FO_SHA1) {
- SHA1Update(&sha1c, (unsigned char *)sd->msg, sd->msglen);
- gotSHA1 = 1;
- }
- bnet_send(sd);
- bnet_sig(sd, BNET_EOD);
+ len = bacl_get(jcr, acltype);
+ if (len < 0) {
+ Jmsg1(jcr, M_WARNING, 0, _("Error reading ACL of %s\n"), jcr->last_fname);
+ return true;
+ }
+ if (len == 0) {
+ return true; /* no ACL */
+ }
+
+ /* Send header */
+ if (!sd->fsend("%ld %d 0", jcr->JobFiles, stream)) {
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ sd->bstrerror());
+ return false;
+ }
+
+ /* Send the buffer to the storage deamon */
+ Dmsg2(400, "Backing up ACL type 0x%2x <%s>\n", acltype, jcr->acl_text);
+ msgsave = sd->msg;
+ sd->msg = jcr->acl_text;
+ sd->msglen = len + 1;
+ if (!sd->send()) {
+ sd->msg = msgsave;
+ sd->msglen = 0;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ sd->bstrerror());
+ return false;
+ }
+
+ jcr->JobBytes += sd->msglen;
+ sd->msg = msgsave;
+ if (!sd->signal(BNET_EOD)) {
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ sd->bstrerror());
+ return false;
}
+
+ Dmsg1(200, "ACL of file: %s successfully backed up!\n", jcr->last_fname);
#endif
+ return true;
+}
-
-#ifdef HAVE_ACL
- /* ACL stream */
- if (ff_pkt->flags & FO_ACL) {
- char *acl_text;
- /* Read ACLs for files, dirs and links */
- if (ff_pkt->type == FT_DIREND) {
- /* Directory: Try for default ACL*/
- acl_t myAcl = acl_get_file(ff_pkt->fname, ACL_TYPE_DEFAULT);
- if (!myAcl) {
- Dmsg1(200, "No default ACL defined for directory: %s!\n", ff_pkt->fname);
- /* If there is no default ACL get standard ACL */
- myAcl = acl_get_file(ff_pkt->fname, ACL_TYPE_ACCESS);
- if (!myAcl) {
- Jmsg1(jcr, M_WARNING, 0, "Error while trying to get ACL of directory: %s!\n", ff_pkt->fname);
- }
- }
- acl_text = acl_to_any_text(myAcl, NULL, ',', TEXT_ABBREVIATE);
- /* Free memory */
- acl_free(myAcl);
- } else {
- /* Files or links */
- acl_t myAcl = acl_get_file(ff_pkt->fname, ACL_TYPE_ACCESS);
- if (!myAcl) {
- Jmsg1(jcr, M_WARNING, 0, "Error while trying to get ACL of file: %s!\n", ff_pkt->fname);
- acl_free(myAcl);
- }
- acl_text = acl_to_any_text(myAcl, NULL, ',', TEXT_ABBREVIATE);
- acl_free(myAcl);
+static bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream)
+{
+ BSOCK *sd = jcr->store_bsock;
+ char attribs[MAXSTRING];
+ char attribsEx[MAXSTRING];
+ int attr_stream;
+ int stat;
+#ifdef FD_NO_SEND_TEST
+ return true;
+#endif
+
+ Dmsg1(300, "encode_and_send_attrs fname=%s\n", ff_pkt->fname);
+ /* Find what data stream we will use, then encode the attributes */
+ if ((data_stream = select_data_stream(ff_pkt)) == STREAM_NONE) {
+ /* This should not happen */
+ Jmsg0(jcr, M_FATAL, 0, _("Invalid file flags, no supported data stream type.\n"));
+ return false;
+ }
+ encode_stat(attribs, ff_pkt, data_stream);
+
+ /* Now possibly extend the attributes */
+ attr_stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
+
+ Dmsg3(300, "File %s\nattribs=%s\nattribsEx=%s\n", ff_pkt->fname, attribs, attribsEx);
+
+ jcr->lock();
+ jcr->JobFiles++; /* increment number of files sent */
+ ff_pkt->FileIndex = jcr->JobFiles; /* return FileIndex */
+ pm_strcpy(jcr->last_fname, ff_pkt->fname);
+ jcr->unlock();
+
+ /*
+ * Send Attributes header to Storage daemon
+ * <file-index> <stream> <info>
+ */
+ if (!sd->fsend("%ld %d 0", jcr->JobFiles, attr_stream)) {
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ sd->bstrerror());
+ return false;
+ }
+ Dmsg1(300, ">stored: attrhdr %s\n", sd->msg);
+
+ /*
+ * Send file attributes to Storage daemon
+ * File_index
+ * File type
+ * Filename (full path)
+ * Encoded attributes
+ * Link name (if type==FT_LNK or FT_LNKSAVED)
+ * Encoded extended-attributes (for Win32)
+ *
+ * For a directory, link is the same as fname, but with trailing
+ * slash. For a linked file, link is the link.
+ */
+ if (ff_pkt->type != FT_DELETED) { /* already stripped */
+ strip_path(ff_pkt);
+ }
+ if (ff_pkt->type == FT_LNK || ff_pkt->type == FT_LNKSAVED) {
+ Dmsg2(300, "Link %s to %s\n", ff_pkt->fname, ff_pkt->link);
+ stat = sd->fsend("%ld %d %s%c%s%c%s%c%s%c", jcr->JobFiles,
+ ff_pkt->type, ff_pkt->fname, 0, attribs, 0, ff_pkt->link, 0,
+ attribsEx, 0);
+ } else if (ff_pkt->type == FT_DIREND || ff_pkt->type == FT_REPARSE) {
+ /* Here link is the canonical filename (i.e. with trailing slash) */
+ stat = sd->fsend("%ld %d %s%c%s%c%c%s%c", jcr->JobFiles,
+ ff_pkt->type, ff_pkt->link, 0, attribs, 0, 0, attribsEx, 0);
+ } else {
+ stat = sd->fsend("%ld %d %s%c%s%c%c%s%c", jcr->JobFiles,
+ ff_pkt->type, ff_pkt->fname, 0, attribs, 0, 0, attribsEx, 0);
+ }
+ if (ff_pkt->type != FT_DELETED) {
+ unstrip_path(ff_pkt);
+ }
+
+ Dmsg2(300, ">stored: attr len=%d: %s\n", sd->msglen, sd->msg);
+ if (!stat) {
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ sd->bstrerror());
+ return false;
+ }
+ sd->signal(BNET_EOD); /* indicate end of attributes data */
+ return true;
+}
+
+/*
+ * Do in place strip of path
+ */
+static bool do_strip(int count, char *in)
+{
+ char *out = in;
+ int stripped;
+ int numsep = 0;
+
+ /* Copy to first path separator -- Win32 might have c: ... */
+ while (*in && !IsPathSeparator(*in)) {
+ *out++ = *in++;
+ }
+ *out++ = *in++;
+ numsep++; /* one separator seen */
+ for (stripped=0; stripped<count && *in; stripped++) {
+ while (*in && !IsPathSeparator(*in)) {
+ in++; /* skip chars */
}
-
- /* If there is an ACL, send it to the Storage daemon */
- if (acl_text) {
- sd = jcr->store_bsock;
- pm_strcpy(&jcr->last_fname, ff_pkt->fname);
-
- /*
- * Send ACL header
- *
- */
- if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_UNIX_ATTRIBUTES_ACL)) {
- berrno be;
- Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- bnet_strerror(sd));
- return 0;
- }
-
- /* Send the buffer to the storage deamon */
- msgsave = sd->msg;
- sd->msg = acl_text;
- sd->msglen = strlen(acl_text) + 1;
- if (!bnet_send(sd)) {
- berrno be;
- sd->msg = msgsave;
- sd->msglen = 0;
- Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- bnet_strerror(sd));
- } else {
- jcr->JobBytes += sd->msglen;
- sd->msg = msgsave;
- if (!bnet_sig(sd, BNET_EOD)) {
- berrno be;
- Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- bnet_strerror(sd));
- } else {
- Dmsg1(200, "ACL of file: %s successfully backed up!\n", ff_pkt->fname);
- }
- }
+ if (*in) {
+ numsep++; /* count separators seen */
+ in++; /* skip separator */
}
}
-#endif
+ /* Copy to end */
+ while (*in) { /* copy to end */
+ if (IsPathSeparator(*in)) {
+ numsep++;
+ }
+ *out++ = *in++;
+ }
+ *out = 0;
+ Dmsg4(500, "stripped=%d count=%d numsep=%d sep>count=%d\n",
+ stripped, count, numsep, numsep>count);
+ return stripped==count && numsep>count;
+}
- /* Terminate any MD5 signature and send it to Storage daemon and the Director */
- if (gotMD5 && ff_pkt->flags & FO_MD5) {
- MD5Final(signature, &md5c);
- bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_MD5_SIGNATURE);
- Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
- memcpy(sd->msg, signature, 16);
- sd->msglen = 16;
- bnet_send(sd);
- bnet_sig(sd, BNET_EOD); /* end of MD5 */
- gotMD5 = 0;
-
- } else if (gotSHA1 && ff_pkt->flags & FO_SHA1) {
- /* Terminate any SHA1 signature and send it to Storage daemon and the Director */
- SHA1Final(&sha1c, signature);
- bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_SHA1_SIGNATURE);
- Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
- memcpy(sd->msg, signature, 20);
- sd->msglen = 20;
- bnet_send(sd);
- bnet_sig(sd, BNET_EOD); /* end of SHA1 */
- gotMD5 = 0;
+/*
+ * If requested strip leading components of the path
+ */
+static void strip_path(FF_PKT *ff_pkt)
+{
+ if (!(ff_pkt->flags & FO_STRIPPATH) || ff_pkt->strip_path <= 0) {
+ Dmsg1(200, "No strip for %s\n", ff_pkt->fname);
+ return;
+ }
+ if (!ff_pkt->fname_save) {
+ ff_pkt->fname_save = get_pool_memory(PM_FNAME);
+ ff_pkt->link_save = get_pool_memory(PM_FNAME);
+ }
+ pm_strcpy(ff_pkt->fname_save, ff_pkt->fname);
+
+ /*
+ * Strip path. If it doesn't succeed put it back. If
+ * it does, and there is a different link string,
+ * attempt to strip the link. If it fails, back them
+ * both back.
+ * Do not strip symlinks.
+ * I.e. if either stripping fails don't strip anything.
+ */
+ if (do_strip(ff_pkt->strip_path, ff_pkt->fname)) {
+ /* Strip links but not symlinks */
+ if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) {
+ pm_strcpy(ff_pkt->link_save, ff_pkt->link);
+ if (!do_strip(ff_pkt->strip_path, ff_pkt->link)) {
+ strcpy(ff_pkt->link, ff_pkt->link_save);
+ strcpy(ff_pkt->fname, ff_pkt->fname_save);
+ }
+ }
+ } else {
+ strcpy(ff_pkt->fname, ff_pkt->fname_save);
+ }
+ Dmsg2(200, "fname=%s stripped=%s\n", ff_pkt->fname_save, ff_pkt->fname);
+}
+
+static void unstrip_path(FF_PKT *ff_pkt)
+{
+ if (!(ff_pkt->flags & FO_STRIPPATH) || ff_pkt->strip_path <= 0) {
+ return;
+ }
+ strcpy(ff_pkt->fname, ff_pkt->fname_save);
+ if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) {
+ strcpy(ff_pkt->link, ff_pkt->link_save);
}
- return 1;
}
projects / bacula / bacula / blobdiff