Author: jflesch
Date: 2007-12-01 18:48:12 +0000 (Sat, 01 Dec 2007)
New Revision: 16195
Modified:
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/SSKBoardFactory.java
Log:
MiniFrost : refuse to add signed boards with obsolete keys
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-12-01
18:45:27 UTC (rev 16194)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-12-01
18:48:12 UTC (rev 16195)
@@ -105,6 +105,7 @@
## Errors
thaw.error.idAlreadyUsed=Impossible de se connecter. Notre identifiant est
d??j?? utilis?? par un autre client connect?? au noeud.
+thaw.error.obsolete=D?sol?, clef obsol?te.
## Menus
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-12-01 18:45:27 UTC
(rev 16194)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-12-01 18:48:12 UTC
(rev 16195)
@@ -105,6 +105,7 @@
## Errors
thaw.error.idAlreadyUsed=Unable to connect. Our Id is already used by another
client connected to the node.
+thaw.error.obsolete=sorry, obsolete key.
## Menus
thaw.menu.file=File
Modified:
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
2007-12-01 18:45:27 UTC (rev 16194)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
2007-12-01 18:48:12 UTC (rev 16195)
@@ -500,12 +500,17 @@
* Put here to make my life simpler with the KSKBoardAttachment.
*/
protected void createBoard(String name, String publicKey, String
privateKey,
- boolean warningIfExisting) {
+ boolean
warningIfExisting) {
if (!thaw.fcp.FreenetURIHelper.isAKey(publicKey)) {
Logger.error(this, "Invalid publicKey");
return;
}
+
+ if (thaw.fcp.FreenetURIHelper.isObsolete(publicKey)) {
+ new thaw.gui.WarningWindow(core,
I18n.getMessage("thaw.error.obsolete"));
+ return;
+ }
if (privateKey != null && "".equals(privateKey))
privateKey = null;
Modified:
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/SSKBoardFactory.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/SSKBoardFactory.java
2007-12-01 18:45:27 UTC (rev 16194)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/SSKBoardFactory.java
2007-12-01 18:48:12 UTC (rev 16195)
@@ -196,8 +196,8 @@
return;
} else if (e.getSource() == ok) {
createBoard(name.getText(),
- publicKey.getText(),
- privateKey.getText());
+ publicKey.getText(),
+ privateKey.getText());
}
synchronized(this) {
