Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-08-28 12:06:32 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-08-28 12:06:32 (GMT)
commit730b88ce48471842333b8769bcfc017335b0440f (patch)
tree3b4c2470fb5bc250d707638520348944e46fe6cf
parent063dc0412e0f84c779f133ec7293873b76f6b2d0 (diff)
parent33af107d8d4ffdeada9ea964fe696af4a23c5b95 (diff)
downloadswift-contrib-730b88ce48471842333b8769bcfc017335b0440f.zip
swift-contrib-730b88ce48471842333b8769bcfc017335b0440f.tar.bz2
Merge remote branch 'origin/swift-1.x'
* swift-1.x: Catch boost file system errors when reading VCards. Conflicts: Swift/Controllers/Storages/VCardFileStorage.cpp
Diffstat
-rw-r--r--Swift/Controllers/Storages/VCardFileStorage.cpp12
-rw-r--r--Swiften/Entity/PayloadPersister.cpp37
-rw-r--r--Swiften/QA/StorageTest/VCardFileStorageTest.cpp37
3 files changed, 66 insertions, 20 deletions
diff --git a/Swift/Controllers/Storages/VCardFileStorage.cpp b/Swift/Controllers/Storages/VCardFileStorage.cpp
index 5f657a4..3dff06f 100644
--- a/Swift/Controllers/Storages/VCardFileStorage.cpp
+++ b/Swift/Controllers/Storages/VCardFileStorage.cpp
@@ -61,9 +61,15 @@ void VCardFileStorage::setVCard(const JID& jid, VCard::ref v) {
}
boost::filesystem::path VCardFileStorage::getVCardPath(const JID& jid) const {
- std::string file(jid.toString());
- String::replaceAll(file, '/', "%2f");
- return boost::filesystem::path(vcardsPath / (file + ".xml"));
+ try {
+ std::string file(jid.toString());
+ String::replaceAll(file, '/', "%2f");
+ return boost::filesystem::path(vcardsPath / (file + ".xml"));
+ }
+ catch (const boost::filesystem::filesystem_error& e) {
+ std::cerr << "ERROR: " << e.what() << std::endl;
+ return boost::filesystem::path();
+ }
}
std::string VCardFileStorage::getPhotoHash(const JID& jid) const {
diff --git a/Swiften/Entity/PayloadPersister.cpp b/Swiften/Entity/PayloadPersister.cpp
index 955135b..729d36a 100644
--- a/Swiften/Entity/PayloadPersister.cpp
+++ b/Swiften/Entity/PayloadPersister.cpp
@@ -25,29 +25,32 @@ PayloadPersister::~PayloadPersister() {
}
void PayloadPersister::savePayload(boost::shared_ptr<Payload> payload, const boost::filesystem::path& path) {
- if (!boost::filesystem::exists(path.parent_path())) {
- try {
+ try {
+ if (!boost::filesystem::exists(path.parent_path())) {
boost::filesystem::create_directories(path.parent_path());
}
- catch (const boost::filesystem::filesystem_error& e) {
- std::cerr << "ERROR: " << e.what() << std::endl;
- }
+ boost::filesystem::ofstream file(path);
+ file << getSerializer()->serialize(payload);
+ file.close();
+ }
+ catch (const boost::filesystem::filesystem_error& e) {
+ std::cerr << "ERROR: " << e.what() << std::endl;
}
- boost::filesystem::ofstream file(path);
- file << getSerializer()->serialize(payload);
- file.close();
}
boost::shared_ptr<Payload> PayloadPersister::loadPayload(const boost::filesystem::path& path) {
- if (boost::filesystem::exists(path)) {
- ByteArray data;
- readByteArrayFromFile(data, path.string());
- boost::shared_ptr<PayloadParser> parser(createParser());
- PayloadParserTester tester(parser.get());
- tester.parse(byteArrayToString(data));
- return parser->getPayload();
+ try {
+ if (boost::filesystem::exists(path)) {
+ ByteArray data;
+ readByteArrayFromFile(data, path.string());
+ boost::shared_ptr<PayloadParser> parser(createParser());
+ PayloadParserTester tester(parser.get());
+ tester.parse(byteArrayToString(data));
+ return parser->getPayload();
+ }
}
- else {
- return boost::shared_ptr<Payload>();
+ catch (const boost::filesystem::filesystem_error& e) {
+ std::cerr << "ERROR: " << e.what() << std::endl;
}
+ return boost::shared_ptr<Payload>();
}
diff --git a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
index 45a04ba..7667176 100644
--- a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
+++ b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
@@ -7,6 +7,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <boost/algorithm/string.hpp>
+#include <sstream>
#include <Swiften/VCards/VCardFileStorage.h>
#include <Swiften/JID/JID.h>
@@ -18,8 +19,12 @@ using namespace Swift;
class VCardFileStorageTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(VCardFileStorageTest);
CPPUNIT_TEST(testSetVCard);
+ // Temporarily disabling this, because it generates error messages on console. Need to figure
+ // out something for not showing error messages during tests.
+ //CPPUNIT_TEST(testSetVCard_LargeFilename);
CPPUNIT_TEST(testGetVCard);
CPPUNIT_TEST(testGetVCard_FileDoesNotExist);
+ //CPPUNIT_TEST(testGetVCard_LargeFilename);
CPPUNIT_TEST_SUITE_END();
public:
@@ -48,6 +53,22 @@ class VCardFileStorageTest : public CppUnit::TestFixture {
CPPUNIT_ASSERT(boost::starts_with(data.toString(), "<vCard xmlns=\"vcard-temp\">"));
}
+ void testSetVCard_LargeFilename() {
+ std::auto_ptr<VCardFileStorage> testling(createTestling());
+ VCard::ref vcard(new VCard());
+ vcard->setFullName("Alice In Wonderland");
+
+ std::ostringstream s;
+ for (int i = 0; i < 1000; ++i) {
+ s << "_";
+ }
+
+ JID jid("alice@wonderland.lit/" + s.str());
+ testling->setVCard(jid, vcard);
+
+ // Just check whether we don't crash
+ }
+
void testGetVCard() {
boost::shared_ptr<VCardFileStorage> testling(createTestling());
VCard::ref vcard(new VCard());
@@ -58,6 +79,22 @@ class VCardFileStorageTest : public CppUnit::TestFixture {
CPPUNIT_ASSERT_EQUAL(std::string("Alice In Wonderland"), result->getFullName());
}
+ void testGetVCard_LargeFilename() {
+ std::auto_ptr<VCardFileStorage> testling(createTestling());
+ VCard::ref vcard(new VCard());
+ vcard->setFullName("Alice In Wonderland");
+
+ std::ostringstream s;
+ for (int i = 0; i < 1000; ++i) {
+ s << "_";
+ }
+ JID jid("alice@wonderland.lit/" + s.str());
+
+ VCard::ref result = testling->getVCard(jid);
+
+ // Just check that we don't have an exception
+ }
+
void testGetVCard_FileDoesNotExist() {
boost::shared_ptr<VCardFileStorage> testling(createTestling());
VCard::ref result = testling->getVCard(JID("alice@wonderland.lit"));