stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Swiften 3.x.y uses FormField::UnknownType as a default type for form fields without any type. Handle that properly in the UserRegistration.

Browse source
This commit is contained in:
Jan Kaluza 2015-11-12 14:23:12 +01:00
parent fa0448ce33
commit d6b44717ca
2 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/tests/userregistration.cpp
View file

@ -34,6 +34,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest
CPPUNIT_TEST(changePassword);
CPPUNIT_TEST(registerUserEmpty);
CPPUNIT_TEST(registerUserNoNeedPassword);
CPPUNIT_TEST(registerUserFormUnknownType);
CPPUNIT_TEST_SUITE_END();
public:
@ -362,6 +363,50 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest
CPPUNIT_ASSERT_EQUAL(std::string(""), user.password);
}
void registerUserFormUnknownType() {
#if HAVE_SWIFTEN_3
Swift::Form::ref form(new Swift::Form(Swift::Form::FormType));
Swift::FormField::ref type = boost::make_shared<Swift::FormField>(Swift::FormField::UnknownType, "jabber:iq:register");
type->setName("FORM_TYPE");
form->addField(type);
Swift::FormField::ref username = boost::make_shared<Swift::FormField>(Swift::FormField::UnknownType, "legacyname");
username->setName("username");
form->addField(username);
Swift::FormField::ref password = boost::make_shared<Swift::FormField>(Swift::FormField::UnknownType, "password");
password->setName("password");
form->addField(password);
Swift::FormField::ref language = boost::make_shared<Swift::FormField>(Swift::FormField::UnknownType, "language");
language->setName("en");
form->addField(language);
Swift::InBandRegistrationPayload *reg = new Swift::InBandRegistrationPayload();
reg->setForm(form);
boost::shared_ptr<Swift::IQ> iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", boost::shared_ptr<Swift::Payload>(reg));
iq->setFrom("user@localhost");
injectIQ(iq);
loop->processEvents();
CPPUNIT_ASSERT_EQUAL(2, (int) received.size());
CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::RosterPayload>());
CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[1])));
CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast<Swift::IQ *>(getStanza(received[1]))->getType());
iq = Swift::IQ::createError(Swift::JID("localhost"), getStanza(received[0])->getTo(), getStanza(received[0])->getID());
received.clear();
injectIQ(iq);
loop->processEvents();
CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));
CPPUNIT_ASSERT_EQUAL(Swift::Presence::Subscribe, dynamic_cast<Swift::Presence *>(getStanza(received[0]))->getType());
#endif
}
};
CPPUNIT_TEST_SUITE_REGISTRATION (UserRegistrationTest);

2
src/userregistration.cpp
View file

@ -382,7 +382,7 @@ bool UserRegistration::handleSetRequest(const Swift::JID& from, const Swift::JID
for (std::vector<FormField::ref>::const_iterator it = fields.begin(); it != fields.end(); it++) {
#if HAVE_SWIFTEN_3
FormField::ref textSingle = *it;
if (textSingle->getType() == FormField::TextSingleType) {
if (textSingle->getType() == FormField::TextSingleType || textSingle->getType() == FormField::UnknownType) {
#else
TextSingleFormField::ref textSingle = boost::dynamic_pointer_cast<TextSingleFormField>(*it);
if (textSingle) {