*
*/
/*
- Copyright (C) 2003-2005 Kern Sibbald
+ Copyright (C) 2003-2006 Kern Sibbald
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.
+ modify it under the terms of the GNU General Public License
+ version 2 as amended with additional clauses defined in the
+ file LICENSE in the main source directory.
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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
*/
switch (stream) {
case STREAM_WIN32_DATA:
case STREAM_WIN32_GZIP_DATA:
+ case STREAM_ENCRYPTED_WIN32_DATA:
+ case STREAM_ENCRYPTED_WIN32_GZIP_DATA:
return true;
}
return false;
switch (stream) {
case STREAM_GZIP_DATA:
- return "GZIP data";
+ return _("GZIP data");
case STREAM_SPARSE_GZIP_DATA:
- return "GZIP sparse data";
+ return _("GZIP sparse data");
case STREAM_WIN32_DATA:
- return "Win32 data";
+ return _("Win32 data");
case STREAM_WIN32_GZIP_DATA:
- return "Win32 GZIP data";
+ return _("Win32 GZIP data");
case STREAM_UNIX_ATTRIBUTES:
- return "File attributes";
+ return _("File attributes");
case STREAM_FILE_DATA:
- return "File data";
- case STREAM_MD5_SIGNATURE:
- return "MD5 signature";
+ return _("File data");
+ case STREAM_MD5_DIGEST:
+ return _("MD5 digest");
case STREAM_UNIX_ATTRIBUTES_EX:
- return "Extended attributes";
+ return _("Extended attributes");
case STREAM_SPARSE_DATA:
- return "Sparse data";
+ return _("Sparse data");
case STREAM_PROGRAM_NAMES:
- return "Program names";
+ return _("Program names");
case STREAM_PROGRAM_DATA:
- return "Program data";
- case STREAM_SHA1_SIGNATURE:
- return "SHA1 signature";
+ return _("Program data");
+ case STREAM_SHA1_DIGEST:
+ return _("SHA1 digest");
case STREAM_MACOS_FORK_DATA:
- return "HFS+ resource fork";
+ return _("HFS+ resource fork");
case STREAM_HFSPLUS_ATTRIBUTES:
- return "HFS+ Finder Info";
+ return _("HFS+ Finder Info");
+ case STREAM_SHA256_DIGEST:
+ return _("SHA256 digest");
+ case STREAM_SHA512_DIGEST:
+ return _("SHA512 digest");
+ case STREAM_SIGNED_DIGEST:
+ return _("Signed digest");
+ case STREAM_ENCRYPTED_FILE_DATA:
+ return _("Encrypted File data");
+ case STREAM_ENCRYPTED_FILE_GZIP_DATA:
+ return _("Encrypted GZIP data");
+ case STREAM_ENCRYPTED_WIN32_DATA:
+ return _("Encrypted Win32 data");
+ case STREAM_ENCRYPTED_WIN32_GZIP_DATA:
+ return _("Encrypted Win32 GZIP data");
+ case STREAM_ENCRYPTED_MACOS_FORK_DATA:
+ return _("Encrypted HFS+ resource fork");
default:
sprintf(buf, "%d", stream);
return (const char *)buf;
}
}
+
+void int64_LE2BE(int64_t* pBE, const int64_t v)
+{
+ /* convert little endian to big endian */
+ if (htonl(1) != 1L) { /* no work if on little endian machine */
+ memcpy(pBE, &v, sizeof(int64_t));
+ } else {
+ int i;
+ uint8_t rv[sizeof(int64_t)];
+ uint8_t *pv = (uint8_t *) &v;
+
+ for (i = 0; i < 8; i++) {
+ rv[i] = pv[7 - i];
+ }
+ memcpy(pBE, &rv, sizeof(int64_t));
+ }
+}
+
+
+void int32_LE2BE(int32_t* pBE, const int32_t v)
+{
+ /* convert little endian to big endian */
+ if (htonl(1) != 1L) { /* no work if on little endian machine */
+ memcpy(pBE, &v, sizeof(int32_t));
+ } else {
+ int i;
+ uint8_t rv[sizeof(int32_t)];
+ uint8_t *pv = (uint8_t *) &v;
+
+ for (i = 0; i < 4; i++) {
+ rv[i] = pv[3 - i];
+ }
+ memcpy(pBE, &rv, sizeof(int32_t));
+ }
+}
+
+
+bool processWin32BackupAPIBlock (BFILE *bfd, void *pBuffer, ssize_t dwSize)
+{
+ /* pByte contains the buffer
+ dwSize the len to be processed. function assumes to be
+ called in successive incremental order over the complete
+ BackupRead stream beginning at pos 0 and ending at the end.
+ */
+
+ PROCESS_WIN32_BACKUPAPIBLOCK_CONTEXT* pContext = &(bfd->win32DecompContext);
+ bool bContinue = false;
+ int64_t dwDataOffset = 0;
+ int64_t dwDataLen;
+
+ /* Win32 Stream Header size without name of stream.
+ * = sizeof (WIN32_STREAM_ID)- sizeof(WCHAR*);
+ */
+ int32_t dwSizeHeader = 20;
+
+ do {
+ if (pContext->liNextHeader >= dwSize) {
+ dwDataLen = dwSize-dwDataOffset;
+ bContinue = false; /* 1 iteration is enough */
+ }
+ else {
+ dwDataLen = pContext->liNextHeader-dwDataOffset;
+ bContinue = true; /* multiple iterations may be necessary */
+ }
+
+ /* flush */
+ /* copy block of real DATA */
+ if (pContext->bIsInData) {
+ if (bwrite(bfd, ((char *)pBuffer)+dwDataOffset, dwDataLen) != (ssize_t)dwDataLen)
+ return false;
+ }
+
+ if (pContext->liNextHeader < dwSize) {/* is a header in this block ? */
+ int32_t dwOffsetTarget;
+ int32_t dwOffsetSource;
+
+ if (pContext->liNextHeader < 0) {
+ /* start of header was before this block, so we
+ * continue with the part in the current block
+ */
+ dwOffsetTarget = -pContext->liNextHeader;
+ dwOffsetSource = 0;
+ } else {
+ /* start of header is inside of this block */
+ dwOffsetTarget = 0;
+ dwOffsetSource = pContext->liNextHeader;
+ }
+
+ int32_t dwHeaderPartLen = dwSizeHeader-dwOffsetTarget;
+ bool bHeaderIsComplete;
+
+ if (dwHeaderPartLen <= dwSize-dwOffsetSource)
+ /* header (or rest of header) is completely available
+ in current block
+ */
+ bHeaderIsComplete = true;
+ else {
+ /* header will continue in next block */
+ bHeaderIsComplete = false;
+ dwHeaderPartLen = dwSize-dwOffsetSource;
+ }
+
+ /* copy the available portion of header to persistent copy */
+ memcpy(((char *)&pContext->header_stream)+dwOffsetTarget, ((char *)pBuffer)+dwOffsetSource, dwHeaderPartLen);
+
+ /* recalculate position of next header */
+ if (bHeaderIsComplete) {
+ /* convert stream name size (32 bit little endian) to machine type */
+ int32_t dwNameSize;
+ int32_LE2BE (&dwNameSize, pContext->header_stream.dwStreamNameSize);
+ dwDataOffset = dwNameSize+pContext->liNextHeader+dwSizeHeader;
+
+ /* convert stream size (64 bit little endian) to machine type */
+ int64_LE2BE (&(pContext->liNextHeader), pContext->header_stream.Size);
+ pContext->liNextHeader += dwDataOffset;
+
+ pContext->bIsInData = pContext->header_stream.dwStreamId == WIN32_BACKUP_DATA;
+ if (dwDataOffset == dwSize)
+ bContinue = false;
+ }
+ else {
+ /* stop and continue with next block */
+ bContinue = false;
+ pContext->bIsInData = false;
+ }
+ }
+ } while (bContinue);
+
+ /* set "NextHeader" relative to the beginning of the next block */
+ pContext->liNextHeader-= dwSize;
+
+ return TRUE;
+}
+
/* ===============================================================
/*
- * Return 1 if we support the stream
- * 0 if we do not support the stream
+ * Return true if we support the stream
+ * false if we do not support the stream
+ *
+ * This code is running under Win32, so we
+ * do not need #ifdef on MACOS ...
*/
-bool is_stream_supported(int stream)
+bool is_restore_stream_supported(int stream)
{
- /* No Win32 backup on this machine */
switch (stream) {
+
+/* Streams known not to be supported */
#ifndef HAVE_LIBZ
case STREAM_GZIP_DATA:
case STREAM_SPARSE_GZIP_DATA:
- return 0;
-#endif
- case STREAM_WIN32_DATA:
case STREAM_WIN32_GZIP_DATA:
- return have_win32_api();
-
+#endif
case STREAM_MACOS_FORK_DATA:
case STREAM_HFSPLUS_ATTRIBUTES:
+ case STREAM_ENCRYPTED_MACOS_FORK_DATA:
return false;
/* Known streams */
#ifdef HAVE_LIBZ
case STREAM_GZIP_DATA:
case STREAM_SPARSE_GZIP_DATA:
+ case STREAM_WIN32_GZIP_DATA:
#endif
+ case STREAM_WIN32_DATA:
case STREAM_UNIX_ATTRIBUTES:
case STREAM_FILE_DATA:
- case STREAM_MD5_SIGNATURE:
+ case STREAM_MD5_DIGEST:
case STREAM_UNIX_ATTRIBUTES_EX:
case STREAM_SPARSE_DATA:
case STREAM_PROGRAM_NAMES:
case STREAM_PROGRAM_DATA:
- case STREAM_SHA1_SIGNATURE:
+ case STREAM_SHA1_DIGEST:
+#ifdef HAVE_SHA2
+ case STREAM_SHA256_DIGEST:
+ case STREAM_SHA512_DIGEST:
+#endif
+#ifdef HAVE_CRYPTO
+ case STREAM_SIGNED_DIGEST:
+ case STREAM_ENCRYPTED_FILE_DATA:
+ case STREAM_ENCRYPTED_FILE_GZIP_DATA:
+ case STREAM_ENCRYPTED_WIN32_DATA:
+ case STREAM_ENCRYPTED_WIN32_GZIP_DATA:
+#endif
case 0: /* compatibility with old tapes */
return true;
}
POOLMEM *win32_fname_wchar;
DWORD dwaccess, dwflags, dwshare;
-
+
/* Convert to Windows path format */
win32_fname = get_pool_memory(PM_FNAME);
win32_fname_wchar = get_pool_memory(PM_FNAME);
return 0;
if (p_CreateFileW && p_MultiByteToWideChar)
- UTF8_2_wchar(&win32_fname_wchar, win32_fname);
+ make_win32_path_UTF8_2_wchar(&win32_fname_wchar, fname);
if (flags & O_CREAT) { /* Create */
if (bfd->use_backup_api) {
dwflags = 0;
}
- // unicode or ansii open for create write
- if (p_CreateFileW && p_MultiByteToWideChar) {
- bfd->fh = p_CreateFileW((LPCWSTR)win32_fname_wchar,
- dwaccess, /* Requested access */
- 0, /* Shared mode */
- NULL, /* SecurityAttributes */
- CREATE_ALWAYS, /* CreationDisposition */
- dwflags, /* Flags and attributes */
- NULL); /* TemplateFile */
- }
- else {
- bfd->fh = p_CreateFileA(win32_fname,
- dwaccess, /* Requested access */
- 0, /* Shared mode */
- NULL, /* SecurityAttributes */
- CREATE_ALWAYS, /* CreationDisposition */
- dwflags, /* Flags and attributes */
- NULL); /* TemplateFile */
- }
-
+ // unicode or ansii open for create write
+ if (p_CreateFileW && p_MultiByteToWideChar) {
+ bfd->fh = p_CreateFileW((LPCWSTR)win32_fname_wchar,
+ dwaccess, /* Requested access */
+ 0, /* Shared mode */
+ NULL, /* SecurityAttributes */
+ CREATE_ALWAYS, /* CreationDisposition */
+ dwflags, /* Flags and attributes */
+ NULL); /* TemplateFile */
+ } else {
+ bfd->fh = p_CreateFileA(win32_fname,
+ dwaccess, /* Requested access */
+ 0, /* Shared mode */
+ NULL, /* SecurityAttributes */
+ CREATE_ALWAYS, /* CreationDisposition */
+ dwflags, /* Flags and attributes */
+ NULL); /* TemplateFile */
+ }
bfd->mode = BF_WRITE;
dwflags = 0;
}
- // unicode or ansii open for open existing write
- if (p_CreateFileW && p_MultiByteToWideChar) {
- bfd->fh = p_CreateFileW((LPCWSTR)win32_fname_wchar,
- dwaccess, /* Requested access */
- 0, /* Shared mode */
- NULL, /* SecurityAttributes */
- OPEN_EXISTING, /* CreationDisposition */
- dwflags, /* Flags and attributes */
- NULL); /* TemplateFile */
- }
- else {
- bfd->fh = p_CreateFileA(win32_fname,
- dwaccess, /* Requested access */
- 0, /* Shared mode */
- NULL, /* SecurityAttributes */
- OPEN_EXISTING, /* CreationDisposition */
- dwflags, /* Flags and attributes */
- NULL); /* TemplateFile */
+ // unicode or ansii open for open existing write
+ if (p_CreateFileW && p_MultiByteToWideChar) {
+ bfd->fh = p_CreateFileW((LPCWSTR)win32_fname_wchar,
+ dwaccess, /* Requested access */
+ 0, /* Shared mode */
+ NULL, /* SecurityAttributes */
+ OPEN_EXISTING, /* CreationDisposition */
+ dwflags, /* Flags and attributes */
+ NULL); /* TemplateFile */
+ } else {
+ bfd->fh = p_CreateFileA(win32_fname,
+ dwaccess, /* Requested access */
+ 0, /* Shared mode */
+ NULL, /* SecurityAttributes */
+ OPEN_EXISTING, /* CreationDisposition */
+ dwflags, /* Flags and attributes */
+ NULL); /* TemplateFile */
- }
+ }
bfd->mode = BF_WRITE;
}
// unicode or ansii open for open existing read
- if (p_CreateFileW && p_MultiByteToWideChar) {
- bfd->fh = p_CreateFileW((LPCWSTR)win32_fname_wchar,
- dwaccess, /* Requested access */
- dwshare, /* Share modes */
- NULL, /* SecurityAttributes */
- OPEN_EXISTING, /* CreationDisposition */
- dwflags, /* Flags and attributes */
- NULL); /* TemplateFile */
- }
- else {
- bfd->fh = p_CreateFileA(win32_fname,
- dwaccess, /* Requested access */
- dwshare, /* Share modes */
- NULL, /* SecurityAttributes */
- OPEN_EXISTING, /* CreationDisposition */
- dwflags, /* Flags and attributes */
- NULL); /* TemplateFile */
- }
+ if (p_CreateFileW && p_MultiByteToWideChar) {
+ bfd->fh = p_CreateFileW((LPCWSTR)win32_fname_wchar,
+ dwaccess, /* Requested access */
+ dwshare, /* Share modes */
+ NULL, /* SecurityAttributes */
+ OPEN_EXISTING, /* CreationDisposition */
+ dwflags, /* Flags and attributes */
+ NULL); /* TemplateFile */
+ } else {
+ bfd->fh = p_CreateFileA(win32_fname,
+ dwaccess, /* Requested access */
+ dwshare, /* Share modes */
+ NULL, /* SecurityAttributes */
+ OPEN_EXISTING, /* CreationDisposition */
+ dwflags, /* Flags and attributes */
+ NULL); /* TemplateFile */
+ }
bfd->mode = BF_READ;
}
}
bfd->errmsg = NULL;
bfd->lpContext = NULL;
+ bfd->win32DecompContext.bIsInData = false;
+ bfd->win32DecompContext.liNextHeader = 0;
free_pool_memory(win32_fname_wchar);
free_pool_memory(win32_fname);
return bfd->mode == BF_CLOSED ? -1 : 1;
}
-
-bool is_stream_supported(int stream)
+/*
+ * This code is running on a non-Win32 machine
+ */
+bool is_restore_stream_supported(int stream)
{
/* No Win32 backup on this machine */
- switch (stream) {
+ switch (stream) {
#ifndef HAVE_LIBZ
case STREAM_GZIP_DATA:
case STREAM_SPARSE_GZIP_DATA:
+ case STREAM_WIN32_GZIP_DATA:
#endif
- case STREAM_WIN32_DATA:
- case STREAM_WIN32_GZIP_DATA:
#ifndef HAVE_DARWIN_OS
case STREAM_MACOS_FORK_DATA:
case STREAM_HFSPLUS_ATTRIBUTES:
#ifdef HAVE_LIBZ
case STREAM_GZIP_DATA:
case STREAM_SPARSE_GZIP_DATA:
+ case STREAM_WIN32_GZIP_DATA:
#endif
+ case STREAM_WIN32_DATA:
case STREAM_UNIX_ATTRIBUTES:
case STREAM_FILE_DATA:
- case STREAM_MD5_SIGNATURE:
+ case STREAM_MD5_DIGEST:
case STREAM_UNIX_ATTRIBUTES_EX:
case STREAM_SPARSE_DATA:
case STREAM_PROGRAM_NAMES:
case STREAM_PROGRAM_DATA:
- case STREAM_SHA1_SIGNATURE:
+ case STREAM_SHA1_DIGEST:
+#ifdef HAVE_SHA2
+ case STREAM_SHA256_DIGEST:
+ case STREAM_SHA512_DIGEST:
+#endif
+#ifdef HAVE_CRYPTO
+ case STREAM_SIGNED_DIGEST:
+ case STREAM_ENCRYPTED_FILE_DATA:
+ case STREAM_ENCRYPTED_FILE_GZIP_DATA:
+ case STREAM_ENCRYPTED_WIN32_DATA:
+ case STREAM_ENCRYPTED_WIN32_GZIP_DATA:
+#endif
#ifdef HAVE_DARWIN_OS
case STREAM_MACOS_FORK_DATA:
case STREAM_HFSPLUS_ATTRIBUTES:
-#endif
- case 0: /* compatibility with old tapes */
+#ifdef HAVE_CRYPTO
+ case STREAM_ENCRYPTED_MACOS_FORK_DATA:
+#endif /* HAVE_CRYPTO */
+#endif /* HAVE_DARWIN_OS */
+ case 0: /* compatibility with old tapes */
return true;
}
- return 0;
+ return false;
}
-/* Old file reader code */
-#ifdef xxx
- if (bfd->prog) {
- POOLMEM *ecmd = get_pool_memory(PM_FNAME);
- ecmd = edit_job_codes(bfd->jcr, ecmd, bfd->prog, fname);
- const char *pmode;
- if (flags & O_RDONLY) {
- pmode = "r";
- } else {
- pmode = "w";
- }
- bfd->bpipe = open_bpipe(ecmd, 0, pmode);
- if (bfd->bpipe == NULL) {
- bfd->berrno = errno;
- bfd->fid = -1;
- free_pool_memory(ecmd);
- return -1;
- }
- free_pool_memory(ecmd);
- if (flags & O_RDONLY) {
- bfd->fid = fileno(bfd->bpipe->rfd);
- } else {
- bfd->fid = fileno(bfd->bpipe->wfd);
- }
- errno = 0;
- return bfd->fid;
- }
-#endif
-
-
int bopen(BFILE *bfd, const char *fname, int flags, mode_t mode)
{
/* Open reader/writer program */
}
/* Normal file open */
+ Dmsg1(400, "open file %s\n", fname);
bfd->fid = open(fname, flags, mode);
bfd->berrno = errno;
Dmsg1(400, "Open file %d\n", bfd->fid);
errno = bfd->berrno;
+
+ bfd->win32DecompContext.bIsInData = false;
+ bfd->win32DecompContext.liNextHeader = 0;
+
return bfd->fid;
}
int bopen_rsrc(BFILE *bfd, const char *fname, int flags, mode_t mode)
{
POOLMEM *rsrc_fname;
- size_t fname_len;
- fname_len = strlen(fname);
rsrc_fname = get_pool_memory(PM_FNAME);
- bstrncpy(rsrc_fname, fname, fname_len + 1);
- bstrncpy(rsrc_fname + fname_len, _PATH_RSRCFORKSPEC,
- strlen(_PATH_RSRCFORKSPEC) + 1);
+ pm_strcpy(rsrc_fname, fname);
+ pm_strcat(rsrc_fname, _PATH_RSRCFORKSPEC);
bopen(bfd, rsrc_fname, flags, mode);
free_pool_memory(rsrc_fname);
return bfd->fid;
projects / bacula / bacula / blobdiff