Author: jflesch
Date: 2007-08-17 18:36:37 +0000 (Fri, 17 Aug 2007)
New Revision: 14759
Modified:
trunk/apps/Thaw/src/thaw/plugins/Signatures.java
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
trunk/apps/Thaw/src/thaw/plugins/signatures/DatabaseManager.java
trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
Log:
Hardcode the public keys of the developpers (only toad, nextgens, jflesch and
bback atm)
Modified: trunk/apps/Thaw/src/thaw/plugins/Signatures.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/Signatures.java 2007-08-17 18:29:35 UTC
(rev 14758)
+++ trunk/apps/Thaw/src/thaw/plugins/Signatures.java 2007-08-17 18:36:37 UTC
(rev 14759)
@@ -23,6 +23,38 @@
public final static int DEFAULT_MIN_TRUST_LEVEL = -1; /* see
Identity.trustLevelInt */
+ public final static String[][] DEVS = {
+ /* {?nick, publicKey } */
+ { "toad",
+ "CHwpbtSA+asXiF3s0xGX1hd3nA2scMMjSZbh:"+
+
"AKC/rtW2/X1DQH9VUzpunZgGXIlhFzFeDX4CT5nGjq7Fbkx9ipgekog5T4ElLVZ6nZDaf9t+t"+
+
"XRbqdBBo4SI7+OnHHJ8MVgRm5doU6bWtMbtEQ5E3LQk8174TNoWKGJ2cuvEsmzgE4BQZPLErs"+
+ "1rVfAfAziI0YPWFHKq2OzEOGW5" },
+ { "nextgens",
+ "CHwpbtSA+asXiF3s0xGX1hd3nA2scMMjSZbh:"+
+
"AM8giqR7C4ND7RxQzByb/ZOLEPoNRd818proqkW5rvqpPd5ODZvJYLZgDC+fe01BU0MFnE7LP"+
+
"tolulBNxiz4AaIyL51FnnzZt9Dp60h9lgawxttQ2DHx553hszZ6LQ5iAvzDivjmKGzWa6p17F"+
+ "+qo2OaGRXL3SGk1fsS40qgdVsP" },
+ { "Jflesch",
+ "CHwpbtSA+asXiF3s0xGX1hd3nA2scMMjSZbh:"+
+
"AIf5yXowXT/0Aa5UhwzOg/kZQnHar/dQl1lFqrcB6TKXf42LZecR1tNV9Hsxboa3Eo5JWdK9T"+
+
"AnHCLBu2lkYUOtcqEH2U0DkAfR11AYn2sdazk/LSFicAq7Ic6ZO7An2RJJUtcHY7pB164GZ76"+
+ "jpOn29iPagMq17n4zbZNqe03q1" },
+ { "bback",
+ "CHwpbtSA+asXiF3s0xGX1hd3nA2scMMjSZbh:"+
+
"AKLw/y7/oDmXYYT0KWNeAfJPcVRgns+Nw9rJ0X/2JLt7o73Yt9PMkx5STJhlJekF36sf+l3vk"+
+
"TzPNHa2xmyjHms2biHl3jGy9dHdAduqNKs99PyW0Z19/QbZ1HEeeCXgllKE+z4aHgWK2CzeID"+
+ "6wPkzZLjFInKLb3gZtQLh5cm3n" }
+
+ /* TODO:
+ * Missing:
+ * - sanity
+ * - zothar
+ * - bombe
+ */
+ };
+
+
/**
* because we must be sure that we won't be used anymore when we will
* unregister from the db
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-08-17 18:29:35 UTC
(rev 14758)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-08-17 18:36:37 UTC
(rev 14759)
@@ -884,7 +884,7 @@
2, /* <= priority */
FCPClientGet.PERSISTENCE_UNTIL_DISCONNECT,
false, /* <= globalQueue */
- 3, /* maxRetries */
+ 5, /* maxRetries */
System.getProperty("java.io.tmpdir"), /* destination directory */
MAX_SIZE, /* max size */
true /* <= noDDA */);
Modified: trunk/apps/Thaw/src/thaw/plugins/signatures/DatabaseManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/signatures/DatabaseManager.java
2007-08-17 18:29:35 UTC (rev 14758)
+++ trunk/apps/Thaw/src/thaw/plugins/signatures/DatabaseManager.java
2007-08-17 18:36:37 UTC (rev 14759)
@@ -44,6 +44,8 @@
createTables(db);
+ addDevs(db);
+
return newDb;
}
@@ -70,6 +72,29 @@
+ "PRIMARY KEY(id))");
}
+
+ public static void addDev(Hsqldb db,
+ String nick,
+ String publicKey) {
+ if (Identity.getIdentity(db, nick, publicKey, false /*
dontCreate */) == null) {
+ Identity identity = new Identity(db, -1,
+ nick, publicKey, null,
+ false,
+
Identity.trustLevelInt[0] /* dev */);
+ identity.insert();
+ }
+ }
+
+
+ public static void addDevs(Hsqldb db) {
+ String[][] devs = thaw.plugins.Signatures.DEVS;
+
+ for (int i = 0 ; i < devs.length ; i++) {
+ addDev(db, devs[i][0], devs[i][1]);
+ }
+ }
+
+
/* dropTables is not implements because signatures may be VERY
important */
/* (anyway, because of the foreign key, it would probably fail */
Modified: trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java 2007-08-17
18:29:35 UTC (rev 14758)
+++ trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java 2007-08-17
18:36:37 UTC (rev 14759)
@@ -286,6 +286,13 @@
public static Identity getIdentity(Hsqldb db,
String nick,
String publicKey) {
+ return getIdentity(db, nick, publicKey, true);
+ }
+
+ public static Identity getIdentity(Hsqldb db,
+ String nick,
+ String publicKey,
+ boolean create) {
try {
synchronized(db.dbLock) {
PreparedStatement st;
@@ -306,6 +313,9 @@
return i;
}
+ if (!create)
+ return null;
+
/* else we must add it, but first we need to
know if it's a dup */
st =
db.getConnection().prepareStatement("SELECT id FROM signatures "+
