Changeset 2481

Timestamp:

29/03/2009 13:51:24 (18 months ago)

Author:

chris

Message:

Change type of BackupStoreFilename? not to derive from std::string, so
it can't accidentally be used as one.

Fix use of encrypted filename in deleted file message, thanks to Kenny
Millington for reporting.

Location:

box/trunk

Files:

• bin/bbackupd/BackupClientDirectoryRecord.cpp (modified) (1 diff)
• bin/bbstored/HousekeepStoreAccount.cpp (modified) (3 diffs)
• lib/backupclient/BackupStoreFilename.cpp (modified) (12 diffs)
• lib/backupclient/BackupStoreFilename.h (modified) (2 diffs)
• lib/backupclient/BackupStoreFilenameClear.cpp (modified) (5 diffs)
• lib/backupclient/BackupStoreObjectDump.cpp (modified) (5 diffs)
• lib/backupstore/BackupStoreCheck2.cpp (modified) (3 diffs)
• test/backupstore/testbackupstore.cpp (modified) (1 diff)

box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp

@@ -1387 +1387 @@
                         BackupClientDeleteList &rdel(rContext.GetDeleteList());
 
+                        BackupStoreFilenameClear clear(en->GetName());
                         std::string localName = MakeFullPath(rLocalPath,
-                                en->GetName());
+                                clear.GetClearFilename());
                         
                         // Delete this entry -- file or directory?

box/trunk/bin/bbstored/HousekeepStoreAccount.cpp

@@ -350 +350 @@
 
                 // map to count the distance from the mark
-                std::map<std::pair<BackupStoreFilename, int32_t>, int32_t> markVersionAges;
+                typedef std::pair<std::string, int32_t> version_t;
+                std::map<version_t, int32_t> markVersionAges;
                         // map of pair (filename, mark number) -> version age
 
@@ -368 +369 @@
                         // Work out ages of this version from the last mark
                         int32_t enVersionAge = 0;
-                        std::map<std::pair<BackupStoreFilename, int32_t>, int32_t>::iterator enVersionAgeI(markVersionAges.find(std::pair<BackupStoreFilename, int32_t>(en->GetName(), en->GetMarkNumber())));
+                        std::map<version_t, int32_t>::iterator enVersionAgeI(
+                                markVersionAges.find(
+                                        version_t(en->GetName().GetEncodedFilename(),
+                                                en->GetMarkNumber())));
                         if(enVersionAgeI != markVersionAges.end())
                         {
@@ -376 +380 @@
                         else
                         {
-                                markVersionAges[std::pair<BackupStoreFilename, int32_t>(en->GetName(), en->GetMarkNumber())] = enVersionAge;
+                                markVersionAges[version_t(en->GetName().GetEncodedFilename(), en->GetMarkNumber())] = enVersionAge;
                         }
                         // enVersionAge is now the age of this version.

box/trunk/lib/backupclient/BackupStoreFilename.cpp

@@ -38 +38 @@
 // --------------------------------------------------------------------------
 BackupStoreFilename::BackupStoreFilename(const BackupStoreFilename &rToCopy)
-        : BackupStoreFilename_base(rToCopy)
+        : mEncryptedName(rToCopy.mEncryptedName)
 {
 }
@@ -66 +66 @@
         bool ok = true;
         
-        if(size() < 2)
+        if(mEncryptedName.size() < 2)
         {
                 // Isn't long enough to have a header
@@ -74 +74 @@
         {
                 // Check size is consistent
-                unsigned int dsize = BACKUPSTOREFILENAME_GET_SIZE(*this);
-                if(dsize != size())
+                unsigned int dsize = BACKUPSTOREFILENAME_GET_SIZE(this->mEncryptedName);
+                if(dsize != mEncryptedName.size())
                 {
                         ok = false;
@@ -81 +81 @@
                 
                 // And encoding is an accepted value
-                unsigned int encoding = BACKUPSTOREFILENAME_GET_ENCODING(*this);
+                unsigned int encoding = BACKUPSTOREFILENAME_GET_ENCODING(this->mEncryptedName);
                 if(encoding < Encoding_Min || encoding > Encoding_Max)
                 {
@@ -120 +120 @@
         
         // assign to this string, storing the header and the extra data
-        assign(hdr, 2);
-        append(data.c_str(), data.size());
+        mEncryptedName.assign(hdr, 2);
+        mEncryptedName.append(data.c_str(), data.size());
         
         // Check it
@@ -142 +142 @@
         CheckValid();
         
-        rProtocol.Write(c_str(), size());
+        rProtocol.Write(mEncryptedName.c_str(), mEncryptedName.size());
 }
 
@@ -178 +178 @@
 
                 // assign to this string, storing the header and the extra data
-                assign(buf, dsize);
+                mEncryptedName.assign(buf, dsize);
         }
         else
@@ -195 +195 @@
 
                 // assign to this string, storing the header and the extra data
-                assign(data, dsize);
+                mEncryptedName.assign(data, dsize);
         }
         
@@ -217 +217 @@
         CheckValid();
         
-        rStream.Write(c_str(), size());
+        rStream.Write(mEncryptedName.c_str(), mEncryptedName.size());
 }
 
@@ -243 +243 @@
 bool BackupStoreFilename::IsEncrypted() const
 {
-        return BACKUPSTOREFILENAME_GET_ENCODING(*this) != Encoding_Clear;
+        return BACKUPSTOREFILENAME_GET_ENCODING(this->mEncryptedName) !=
+                Encoding_Clear;
 }
 
@@ -251 +252 @@
 // Function
 //              Name:    BackupStoreFilename::SetAsClearFilename(const char *)
-//              Purpose: Sets this object to be a valid filename, but with a filename in the clear.
-//                               Used on the server to create filenames when there's no way of encrypting it.
+//              Purpose: Sets this object to be a valid filename, but with a
+//                       filename in the clear. Used on the server to create
+//                       filenames when there's no way of encrypting it.
 //              Created: 22/4/04
 //
@@ -269 +271 @@
         
         // Store the encoded string
-        assign(encoded);
+        mEncryptedName.assign(encoded);
         
         // Stuff which must be done

box/trunk/lib/backupclient/BackupStoreFilename.h

@@ -41 +41 @@
 //
 // --------------------------------------------------------------------------
-class BackupStoreFilename : public BackupStoreFilename_base
+class BackupStoreFilename /* : public BackupStoreFilename_base */
 {
+private:
+        std::string mEncryptedName;
+
 public:
         BackupStoreFilename();
@@ -72 +75 @@
         };
 
+        const std::string& GetEncodedFilename() const
+        {
+                return mEncryptedName;
+        }
+
+        bool operator==(const BackupStoreFilename& rOther) const
+        {
+                return mEncryptedName == rOther.mEncryptedName;
+        }
+
+        bool operator!=(const BackupStoreFilename& rOther) const
+        {
+                return mEncryptedName != rOther.mEncryptedName;
+        }
+
 protected:
         virtual void EncodedFilenameChanged();
+        void SetEncodedFilename(const std::string &rEncoded)
+        {
+                mEncryptedName = rEncoded;
+        }
 };
 

box/trunk/lib/backupclient/BackupStoreFilenameClear.cpp

@@ -161 +161 @@
                 
         // Decode the header
-        int size = BACKUPSTOREFILENAME_GET_SIZE(*this);
-        int encoding = BACKUPSTOREFILENAME_GET_ENCODING(*this);
+        int size = BACKUPSTOREFILENAME_GET_SIZE(GetEncodedFilename());
+        int encoding = BACKUPSTOREFILENAME_GET_ENCODING(GetEncodedFilename());
         
         // Decode based on encoding given in the header
@@ -170 +170 @@
                 BOX_TRACE("**** BackupStoreFilename encoded with "
                         "Clear encoding ****");
-                mClearFilename.assign(c_str() + 2, size - 2);
+                mClearFilename.assign(GetEncodedFilename().c_str() + 2,
+                        size - 2);
                 break;
                 
@@ -245 +246 @@
         
         // Store the encoded string
-        assign((char*)buffer, encSize);
+        SetEncodedFilename(std::string((char*)buffer, encSize));
 }
 
@@ -259 +260 @@
 void BackupStoreFilenameClear::DecryptEncoded(CipherContext &rCipherContext) const
 {
+        const std::string& rEncoded = GetEncodedFilename();
+
         // Work out max size
-        int maxOutSize = rCipherContext.MaxOutSizeForInBufferSize(size()) + 4;
+        int maxOutSize = rCipherContext.MaxOutSizeForInBufferSize(rEncoded.size()) + 4;
         
         // Make sure encode/decode buffer has enough space
@@ -269 +272 @@
         
         // Decrypt
-        const char *str = c_str() + 2;
-        int sizeOut = rCipherContext.TransformBlock(buffer, sEncDecBufferSize, str, size() - 2);
+        const char *str = rEncoded.c_str() + 2;
+        int sizeOut = rCipherContext.TransformBlock(buffer, sEncDecBufferSize, str, rEncoded.size() - 2);
         
         // Assign to this

box/trunk/lib/backupclient/BackupStoreObjectDump.cpp

@@ -71 +71 @@
 
         // So repeated filenames can be illustrated, even though they can't be decoded
-        std::map<BackupStoreFilename, int> nameNum;
+        std::map<std::string, int> nameNum;
         int nameNumI = 0;
 
@@ -79 +79 @@
         {
                 // Choose file name index number for this file
-                std::map<BackupStoreFilename, int>::iterator nn(nameNum.find((*i)->GetName()));
+                std::map<std::string, int>::iterator nn(nameNum.find((*i)->GetName().GetEncodedFilename()));
                 int ni = nameNumI;
                 if(nn != nameNum.end())
@@ -87 +87 @@
                 else
                 {
-                        nameNum[(*i)->GetName()] = nameNumI;
+                        nameNum[(*i)->GetName().GetEncodedFilename()] = nameNumI;
                         ++nameNumI;
                 }
@@ -125 +125 @@
                         (*i)->GetAttributesHash(),
                         (*i)->GetAttributes().GetSize(),
-                        (*i)->GetName().size(),
+                        (*i)->GetName().GetEncodedFilename().size(),
                         ni,
                         ((f & BackupStoreDirectory::Entry::Flags_File)?" file":""),
@@ -174 +174 @@
         BackupStoreFilename fn;
         fn.ReadFromStream(rFile, IOStream::TimeOutInfinite);
-        OutputLine(file, ToTrace, "Filename size: %d\n", fn.size());
+        OutputLine(file, ToTrace, "Filename size: %d\n",
+                fn.GetEncodedFilename().size());
         
         BackupClientFileAttributes attr;

box/trunk/lib/backupstore/BackupStoreCheck2.cpp

@@ -751 +751 @@
                 // Records of things seen
                 std::set<int64_t> idsEncountered;
-                std::set<BackupStoreFilename> filenamesEncountered;
+                std::set<std::string> filenamesEncountered;
 
                 do
@@ -793 +793 @@
                                         // Check to see if the name has already been encountered -- if not, then it
                                         // needs to have the old version flag set
-                                        if(filenamesEncountered.find((*i)->GetName()) != filenamesEncountered.end())
+                                        if(filenamesEncountered.find((*i)->GetName().GetEncodedFilename()) != filenamesEncountered.end())
                                         {
                                                 // Seen before -- check old version flag set
@@ -819 +819 @@
                                                 
                                                 // Remember filename
-                                                filenamesEncountered.insert((*i)->GetName());
+                                                filenamesEncountered.insert((*i)->GetName().GetEncodedFilename());
                                         }
                                 }

box/trunk/test/backupstore/testbackupstore.cpp

@@ -233 +233 @@
                 
                 // Check that it's been encrypted
-                TEST_THAT(fn2.find("name") == fn2.npos);
+                std::string name(fn2.GetEncodedFilename());
+                TEST_THAT(name.find("name") == name.npos);
                         
                 // Bung it in a stream, get it out in a Clear filename