mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-25 23:06:10 -05:00
Merge pull request #1171 from csoler/v0.6-SecurityFixes
V0.6 security fixes
This commit is contained in:
csoler
GitHub
commit
ede51ab33d
@ -6,7 +6,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>969</width>
|
||||
<width>978</width>
|
||||
<height>778</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -279,7 +279,11 @@
|
||||
<string><html><head/><body><p>Add selected item to collection one by one.</p><p>Select parent dir to add this too.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;Enter&gt;</span></p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">></string>
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/feedback_arrow.png</normaloff>:/images/feedback_arrow.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -301,7 +305,11 @@
|
||||
<string><html><head/><body><p>Add selected item to collection.</p><p>If a directory is selected, all of his children will be added.</p><p><span style=" text-decoration: underline; vertical-align:sub;">&lt;Shift + Enter&gt;</span></p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>>></string>
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../plugins/FeedReader/gui/FeedReader_images.qrc">
|
||||
<normaloff>:/images/Update.png</normaloff>:/images/Update.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -323,7 +331,11 @@
|
||||
<string><html><head/><body><p>Remove selected item from collection.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;Del&gt;</span></p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true"><</string>
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/deletemail24.png</normaloff>:/images/deletemail24.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -345,7 +357,11 @@
|
||||
<string><html><head/><body><p>Make a new directory in the collection.</p><p><span style=" font-style:italic; vertical-align:sub;">&lt;+&gt;</span></p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>+</string>
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<normaloff>:/images/directoryadd_24x24_shadow.png</normaloff>:/images/directoryadd_24x24_shadow.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -501,6 +517,7 @@
|
||||
</customwidgets>
|
||||
<resources>
|
||||
<include location="../images.qrc"/>
|
||||
<include location="../../../../plugins/FeedReader/gui/FeedReader_images.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
@ -293,17 +293,27 @@ void ConnectFriendWizard::setCertificate(const QString &certificate, bool friend
|
||||
#ifdef FRIEND_WIZARD_DEBUG
|
||||
std::cerr << "ConnectFriendWizard got id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl;
|
||||
#endif
|
||||
mCertificate = certificate.toUtf8().constData();
|
||||
|
||||
// Cyril: I disabled this because it seems to be not used anymore.
|
||||
//setStartId(friendRequest ? Page_FriendRequest : Page_Conclusion);
|
||||
setStartId(Page_Conclusion);
|
||||
if (friendRequest){
|
||||
ui->cp_Label->show();
|
||||
ui->requestinfolabel->show();
|
||||
setTitleText(ui->ConclusionPage, tr("Friend request"));
|
||||
ui->ConclusionPage->setSubTitle(tr("Details about the request"));
|
||||
}
|
||||
if(peerDetails.id == rsPeers->getOwnId())
|
||||
{
|
||||
setField("errorMessage", tr("This is your own certificate! You would not want to make friend with yourself. Wouldn't you?") ) ;
|
||||
error = false;
|
||||
setStartId(Page_ErrorMessage);
|
||||
}
|
||||
else
|
||||
{
|
||||
mCertificate = certificate.toUtf8().constData();
|
||||
|
||||
// Cyril: I disabled this because it seems to be not used anymore.
|
||||
//setStartId(friendRequest ? Page_FriendRequest : Page_Conclusion);
|
||||
setStartId(Page_Conclusion);
|
||||
if (friendRequest){
|
||||
ui->cp_Label->show();
|
||||
ui->requestinfolabel->show();
|
||||
setTitleText(ui->ConclusionPage, tr("Friend request"));
|
||||
ui->ConclusionPage->setSubTitle(tr("Details about the request"));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// error message
|
||||
setField("errorMessage", tr("Certificate Load Failed") + ": \n\n" + getErrorString(cert_load_error_code)) ;
|
||||
@ -497,8 +507,8 @@ void ConnectFriendWizard::initializePage(int id)
|
||||
else
|
||||
ui->alreadyRegisteredLabel->hide();
|
||||
if(tmp_det.ownsign) {
|
||||
ui->signGPGCheckBox->setChecked(true);
|
||||
ui->signGPGCheckBox->setEnabled(false);
|
||||
ui->signGPGCheckBox->setChecked(false); // if already signed, we dont allow to sign it again, and dont show the box.
|
||||
ui->signGPGCheckBox->setVisible(false);
|
||||
ui->signGPGCheckBox->setToolTip(tr("You have already signed this key"));
|
||||
}
|
||||
|
||||
@ -702,6 +712,13 @@ bool ConnectFriendWizard::validateCurrentPage()
|
||||
#ifdef FRIEND_WIZARD_DEBUG
|
||||
std::cerr << "ConnectFriendWizard got id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl;
|
||||
#endif
|
||||
|
||||
if(peerDetails.id == rsPeers->getOwnId())
|
||||
{
|
||||
setField("errorMessage", tr("This is your own certificate! You would not want to make friend with yourself. Wouldn't you?") ) ;
|
||||
error = false;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
// error message
|
||||
@ -735,6 +752,12 @@ bool ConnectFriendWizard::validateCurrentPage()
|
||||
#ifdef FRIEND_WIZARD_DEBUG
|
||||
std::cerr << "ConnectFriendWizard got id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl;
|
||||
#endif
|
||||
|
||||
if(peerDetails.id == rsPeers->getOwnId())
|
||||
{
|
||||
setField("errorMessage", tr("This is your own certificate! You would not want to make friend with yourself. Wouldn't you?") ) ;
|
||||
error = false;
|
||||
}
|
||||
} else {
|
||||
setField("errorMessage", QString(tr("Certificate Load Failed:something is wrong with %1")).arg(fn) + " : " + getErrorString(cert_error_code));
|
||||
error = false;
|
||||
|
||||
@ -1618,8 +1618,8 @@ resources.</string>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
<include location="../icons.qrc"/>
|
||||
<include location="../images.qrc"/>
|
||||
<include location="../icons.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user