From af67c633d5c39c46ca04e2ab8fc6f0e6e58268c3 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 25 Jul 2005 09:56:54 +0000
Subject: [PATCH] doc-changes and more strict brute-force handling

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@431 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 doc/Download.html                           |  21 +++++++++++++++-----
 doc/Technology.html                         |   2 +-
 doc/grafics/startupLinux.gif                | Bin 729 -> 694 bytes
 doc/grafics/startupMac.gif                  | Bin 1724 -> 1744 bytes
 doc/grafics/startupWin.gif                  | Bin 846 -> 658 bytes
 source/de/anomic/http/httpdFileHandler.java |   6 +++++-
 source/de/anomic/server/serverCore.java     |  12 ++++++++---
 source/de/anomic/yacy/yacySeedDB.java       |   6 +++---
 8 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/doc/Download.html b/doc/Download.html
index b5fd793af..344879494 100644
--- a/doc/Download.html
+++ b/doc/Download.html
@@ -36,12 +36,23 @@ You can <a href="http://java.sun.com/j2se/1.4.2/download.html">download the Java
 
 <p><b>Latest Release:</b>
 The latest YaCy release version is 0.39<br>
-Download the <a href="http://www.yacy.net/yacy/release/yacy_v0.39_20050722_424.tar.gz">generic (all platforms with J2SE 1.4: Linux, Mac OS X, Windows, Solaris) YaCy 0.39</a> here.<br>
-If you want to install YaCy on Windows, you can use the convenient <a href="http://www.yacy.net/yacy/release/yacy_v0.38_20050603_208.exe">Windows-Installer-Version of YaCy 0.38</a>.
-
-</p>
-<p>YaCy is also hosted on <a href="http://developer.berlios.de/projects/yacy/">yacy@BerliOS</a> and <a href="http://freshmeat.net/projects/yacyproxy/">yacy@freshmeat.net</a>.
+Nightly builds from compiles out of SVN can be obtained from <a href="http://devbin.yacy-forum.de/">http://devbin.yacy-forum.de/</a>.<br>
+<p>Main releases of YaCy are hosted on <a href="http://www.yacy.net/yacy/">yacy.net</a>, <a href="http://developer.berlios.de/projects/yacy/">yacy@BerliOS.de</a> and <a href="http://freshmeat.net/projects/yacyproxy/">yacy@freshmeat.net</a>.<br>
+Download Mirrors and YaCy Flavours:
+<ul>
+  <li>Generic release of YaCy (all platforms with J2SE 1.4.2: Linux, Mac OS X, Windows, Solaris):</li>
+  <ul>
+    <li><tt>from yacy.net&nbsp;&nbsp;&nbsp;: <a href="http://www.yacy.net/yacy/release/yacy_v0.39_20050722_425.tar.gz"><tt>yacy_v0.39_20050722_425.tar.gz</tt></a></tt></li>
+    <li><tt>from BerliOS.de&nbsp;: <a href="http://download.berlios.de/yacy/yacy_v0.39_20050722_425.tar.gz"><tt>yacy_v0.39_20050722_425.tar.gz</tt></a></tt></li>
+  </ul>
+  <li>Windows-flavour release of YaCy (same code as generic release, but with convenient Windows-Installer):</li>
+  <ul>
+    <li><tt>from yacy.net&nbsp;&nbsp;&nbsp;: <a href="http://www.yacy.net/yacy/release/yacy_v0.39_20050722_425.exe"><tt>yacy_v0.39_20050722_425.exe</tt></a></tt></li>
+    <li><tt>from BerliOS.de&nbsp;: <a href="http://download.berlios.de/yacy/yacy_v0.39_20050722_425.exe"><tt>yacy_v0.39_20050722_425.exe</tt></a></tt></li>
+  </ul>
+</ul>
 </p>
+
 <!--
 <p><table bgcolor="#EEEEEE" width="100%"><tr><td>
 <fieldset><legend><b>All current and historic releases:</b></legend>
diff --git a/doc/Technology.html b/doc/Technology.html
index 2e659821e..7967ac9ad 100644
--- a/doc/Technology.html
+++ b/doc/Technology.html
@@ -71,7 +71,7 @@ ensure complete browsing privacy.
 The words that are stored in your local word index are stored using a word hash. That means that not any word is stored, but only the word hash.
 You cannot find any word that is indexed as clear text. You can also not re-translate the word hashes into the original word. This means that
 you don't know actually which words are stored in your system. The positive effect is, that you cannot be responsible for the words that
-are stored in your peer. But if you want to deny storage of specific words, you can put them into the 'bluelist' (in the file httpProxy.bluelist).
+are stored in your peer. But if you want to deny storage of specific words, you can put them into the 'bluelist' (in the file yacy.bluelist).
 No word that is in the bluelist can be stored, searched or even viewed through the proxy.
 
 </td></tr><tr><td valign="top"><b>Peer Communication Encryption</b></td><td>
diff --git a/doc/grafics/startupLinux.gif b/doc/grafics/startupLinux.gif
index 24272c5a7dc159b8fb22e128bf470b68d1d891bf..362e2831513a054447355097052df57098c6e401 100644
GIT binary patch
delta 490
zcmV<G0Tuq)1-1o{)_<#x0|Sf#1dId$jR6J;2Li6JvX%h~wXCQLzMRF31rM(P4ho9{
z4+yXh4h9Mc%FND}0S>~$rVGZI<Bbao00a*Liw6%3j0@lA>Fe#k^x@F>lmZJ69y|;1
zuYdpn!VEZgu;5hz0|XWtAh^IFLIBYUIGDDm+A;tF{~nOT_<uknM@aty4s<X;!Gi?h
zlpz2YX@P=+1ppWb$WvB=k^>yb+9`4Y0-`+^{nQsNr~#5Rl|Il1$tF$!-lQoTc}jpw
z1pOW@V8BeCv5>yZ?QC~+k-0`8pDr>G4?(<;Q9(YCTazp!ZwK7+9VTGmNk=L7nw{lf
zF)pzqy&2mWK!4dTc8?@aO8nHDFl_rG?#*lKU0P!bYoXP7*llE?i$d}&2{<!sN&!rJ
zUIdy|P{opRw_6RsCP7y~7v?n3x_Gc%i!=k!C@ev`ow5i<za86JbX|IB>Fd4fp(TJS
zh5ddI7(u`S38pcBv_3G_+vFp<<H=F_qID;sCs1PmyJG>MfPI{(ateW&fy3Z0q~Uha
zW(}e;%03uoc*-UkcIcrciG(QPh$NP1;)y7xsN#w&w&>!EFvck3j5OA0<Bd4xsN;@2
g_UPk}Kn5w~kVF<~<dH}wspOJOHtFP(dqe;LI}KRVU;qFB

delta 526
zcmV+p0`dK}1=$6V)_;`&2&=EKnG6r02?_|bj0%mrj|U0~2de`Q1&sj%jt&n2mjcO*
z2f4?L&5P5W%mCQa0S=G`54Z-^i`JRe3dW2D4++ZD=8gdm4+6a6*Y&RT59Iyyt|{o}
z3KD@_{Q%6Wx2>Lo1^w>PLT~_Ly@L#wNej0?8Z>hc|CRw5SbvNWF?)=(g=4tzfiM6A
zzCEJ10Dyx4-UNITK#SHl1q8MU9s0-tIiU)gVUsD;K+TBTk`36UKv+F;RdqTd_G@H;
z0q+{sySGj0JqHH?1Y8u(KtV?1Y^r6TH6Sep01^c4sTP~qlzEjlVmfgb%0)5@ybHF?
zfiQXw)>S(YE`RR;0bv2OyU9qVHng<X+LV@=XD*)C8oC>}EkS~QC-W_WxCjAW0Js`A
z&KL4Q>;Mau)_c0lbhvjSuO-7Zi&$y^8yT5?K;U)8goquQ%nabD_n-od6=-IFK+xNb
z2CVaK&KQAY0?IEMVBoCu0_)5dxEKGPdCiMd6-|bF27e^8j$~x9LqL88SYsYj-F=11
zGJZ7@R3^*R<cVqM!E#bBvA`tZDe5KI34R~NQox0gs1o9fFrG3>j5OBB$tE`DsAD6E
z^yuS{Kn5w~kVF<~<dH}wspOJOHtFP(P(~@`lvGw}<&{`wspXbjcIoApV1_B?m}Hh|
Q=9y@wsR!nodqe;LJ2edK8vp<R

diff --git a/doc/grafics/startupMac.gif b/doc/grafics/startupMac.gif
index be715cb7f0249b1984c5115f6ece46241fb5aca6..d8fb0b7ed348204d7ddedd9a158e47abcd9d1834 100644
GIT binary patch
delta 629
zcmV-*0*d{-4bTm+R|J2ahc0?{8I0~wo2FlD5dauSTfhU@9W)9;=khhcU<?dk3ql1j
zaAoQb1>igD7cf+fcE<yd%0;hpB>V#g9Ynwb2wWt9MG@&G0QA7e%z$34_r41NuLpvY
zCJbl>00IRlP*5M=>z*3-2lehgN2x3%yaE8=w$K2YfE`A3!GM40Y2$Ui<HG{9rvL&J
z;w631OaNH1JMvW{5V3RMD~5*w;W24OxWUdna<Kr}+2ST49N;eahmZp5E=}oU$n;RL
zB82EJ0puZuAg=cS&Ae^_4%~$U4YIu+A|QgGn9(qLrxyegz<;{?3Jr;80pV2-AqqHv
zLNXycE&p~AAp(CWL=AO!5oR1Dh74gv^b%4#Fg}1I+aTZY#&(beAiy;Od?8Cp2*%;{
zj(H`FNDD90y6IJLb^r*XAY`Y${@oFak37f`xl)K&6tE$;1C0M{_`UiqAOOAlq9bSY
zMp8150U%UF6ZuGx2`1n#oopROUZ<HXV&syo>|Y}hDZ7723hw~;;GQ6gw7nW4WE&^h
z9vn+ZkY0W<lcpr!C+Vm>K-LeHal9oVFQ6JcVh1;6w8$`ZiNyq*#Fp1QC;w&$l40y;
zcuKir6s==L*WmJ#qa0;1?YYYSDFBo`l%ppBN|{Phu>#8L!z;;Wz9Uj^7ZYrxAvwa!
zS0rS8dU{R?Vjuqb&KiP~p?$zk82j+ZX7<mEwj^UTLutsd`L2D|1b{A}7t7+U<Ty7i
z((l$1HSPFir!o6W@c2@??itl{pgXEkF}Jy;I`wmvi<6-S6&ekzSjS4%vYPd*XickH
P*UHwmy7jFlhyVaP6(1Ly

delta 609
zcmV-n0-pWQ4ZIDoR|J0myyyAoq%Txn1_v#m8H)lKvU=&TH?-A37#yU)>jx2_fNu|6
zIpYI2>Ee6rq>n=T1-5_pKmxe<K|mp#gr0x_fneAAMc3m?{YBJ2fB^Rjl*GUQ)%>Nv
zihm){hXDt5|NV@&7xGdct0RD~_W@{fz(ED{!94uWdw@YO!U}&-><<971As2<_kh%#
zD>eNqPybZMisoH}4*{59YWQ%IRA9t|xB);tF7mtq72+o>0iFOn*t!PN0$&R_h%O4V
zzW(VY4+CI;L0ZU$-T@#L0_fiX6KFgD+ztQ);T=bkh>-@iP7@78A_K%XzybKsiWU5w
zW*EReg#TC(JAZ%C;eLA8I_y|cFTb!I`vM?FHoh(Z#%rBsu6I4#4H0=pT-_0wSVttr
z@Pm{QU~2gHM>i_*AnNO)5fjil^!?6+tD~b2>&V0-8q$#6v&ADH*+&K3(E`Z}B@?Z<
z#6mjJhX`S!AzgFDJ}iJE1lYyy67ofqFkp40tRp4=Xvu$D0`iOsM8GDmM@l;$50rTn
z<rJH^x(JGJihU#`LbeeL1;mhz7V+Q*qZqpIvGJ7{q9z<;s7oJKQZtvlWh`;RjA4?|
z76IVHCo2%jWU?`ex`<)_{9rv)O7kze*u+InF~$K#WQmh(#Qp*h&{w+iBIg7oAn(bH
zQ)16)oc>Pp<T2^_kO4_^cnnFDLoVSEk&0AN92wq86ZoHcaBiK%gB9xjgQ3jTG^U@M
vDNc8qxy|wPr<SUmP=`v?q8jz6NKL9zm&(+pI`yegjgz4U6$U*)1ONa#`Pmy7

diff --git a/doc/grafics/startupWin.gif b/doc/grafics/startupWin.gif
index 60d82d02df696e48da38b4a4c7e19d014a75ccef..736c0d8d18f41d06ff21c8db13a9a8735c899b2e 100644
GIT binary patch
delta 516
zcmV+f0{i{W29gDkn16b0Cb-}5xP1P8uqlLre$Vgw{{sYecM^FAhlq)ai;RMVg#(O|
ziFyx}m5z^wlarSNmY<n~o1Bafr>Ll+cX@!WuYrT3fpoRCv5yFO1OUChzrex3xSD~&
z$H=|Jv%JXwZ_dlC#>vf}$<l1Q#{~s$v=0Q{!r5!v!36*T0e`%)=>ZSH<!a}^59!a(
zg6akF!>ih;`Rdk9AAnc{0(|o4YhIdqz0$pNqwk(Nbqo&zG$*jvy@K%nQVoFDEu%v;
z5CMF&s4hUuekFgMJd;w;gLNMVz&v<rfXt2bYTf*p?k2&E%78vZHWX&RQ!)R^V&yB9
z$DS(T@kE+*s(-d$s62u_6-_D1s$o?+BWIT8)p-86uASNDsy$eM+SXNT&z3E(=BnCD
zMYwR`T+M_5&h^1?D#nl_OP)-*vgOMn5=_x7fir>xo;!oq>^by=(WXbFZc_SmXw$7L
ztS&K|3F*_Fb6dDA`@(3^pj~tR{TcWZ-o=xzMvl98?tRv;aU-v7B)W18rGux2E<JW}
z(x{IM|2=#8Zt2ZGPyfC-{q^&{owL{d9KCnj?z0D{zni%K?)vFQ96x3R7HHss2qviD
zf($n3;DZoGDB*+@R%qdc7-p#9h8%Y2;fElGDB_4DmT2OMD5j|5iY&J1;)^iGD5Dt>
G0028ID-m`8

delta 706
zcmV;z0zLhb1<nSLn1A|5XuIF=xZJ(A5C-_Xe$Vd@2oH4>cL#-rhlq)afPxc*ijanQ
z50jIOjR=pCkd*_Jo|lc9n~4vmr>CKUcYdv|e}R~HbF{Uvn3;b7yS%-=zrMG!y1>Q8
z0K%fg$8N{Ss&%u@1iPNc$*ar01qE$?fCSyZ*wNa&1pom7)PJz(0S~|AYtp|D=m6Ah
z@Bszz!O-)}apQ)M9k>9V{PB{fhTb^<?%EWzmoA;cXR(w~>t&DNJ5&Sz-f_FgFpa}q
z9Vw;@u(IFCUM10-#Aixf#{n*pnHm5SU_)9DL=p@-@M1NeCXEHPm(tYBe;HTtLWOcC
zfTcQ(9*r7}qkk!sUbRBSwejjHu+HKkm01;@Ke5hYp4s@7<10UF=c46Us}|RJQ+=Tt
zOt>&vrMOBIMwPg+<HwLAPY?irvgOK{FKf=sd9&xvpg)TaO<F*Ww5U_7Ud_5!4a%)!
z%btDAG!3t`uh!#e_Uz!^Z_no5^?E8?+7}fXRUVjmZhzY|0_z5DJh<DpZKv;DE?qZs
zx7oFW-&=e-cCg>kf=~W?@Al@+&zql*7P<`S^2d8uzrVY9!PQxpU;B5-X$L@Yg#DM^
zeEJ#a9DxAx_MUtC*%t$a3c|;rgAy9}UxyQJ=-+`fP*$LG!ksssZyj>yo`>uW=$?fz
z3}@qwN`L)Q9*#WTXcUbv^eE(zB+dXEkx0@8qzg$Rm*kGaQI*?q!!6kYj#RdmWo}T;
zCRU2V^%kCWJX*<ukGr9#;d}aRxmuU9X|<qt53VPrjb^TZW`zBT*JhtR!Wk!@f3CUS
zh)SM@C71(-nPPZ23fknP&g7{ArI@~1Vy2wdc01Z=pq3_TsHBc6s${69s_Lq&w(9Du
ou*NFuthCl@>#exvs_U-2_Uh}ezy>Squ*4Q??6Jru%R>YJJAo2*jsO4v

diff --git a/source/de/anomic/http/httpdFileHandler.java b/source/de/anomic/http/httpdFileHandler.java
index 8a16d5a0b..6ebf41c7d 100644
--- a/source/de/anomic/http/httpdFileHandler.java
+++ b/source/de/anomic/http/httpdFileHandler.java
@@ -264,7 +264,11 @@ public final class httpdFileHandler extends httpdAbstractHandler implements http
                 // a wrong authentication was given. Ask again
                 String clientIP = conProp.getProperty("CLIENTIP", "unknown-host");
                 serverLog.logInfo("HTTPD", "Wrong log-in for account 'admin' in http file handler for path '" + path + "' from host '" + clientIP + "'");
-                serverCore.bfHost.put(clientIP, "sleep");
+                Integer attempts = (Integer) serverCore.bfHost.get(clientIP);
+                if (attempts == null)
+                    serverCore.bfHost.put(clientIP, new Integer(1));
+                else
+                    serverCore.bfHost.put(clientIP, new Integer(attempts.intValue() + 1));
 
                 httpHeader headers = getDefaultHeaders();
                 headers.put(httpHeader.WWW_AUTHENTICATE,"Basic realm=\"admin log-in\"");
diff --git a/source/de/anomic/server/serverCore.java b/source/de/anomic/server/serverCore.java
index 46265b795..19b2c6841 100644
--- a/source/de/anomic/server/serverCore.java
+++ b/source/de/anomic/server/serverCore.java
@@ -185,7 +185,7 @@ public final class serverCore extends serverAbstractThread implements serverThre
         this.port = port;
         this.commandMaxLength = commandMaxLength;
         this.denyHost = (blockAttack) ? new Hashtable() : null;
-        
+
         // initialize logger
         this.log = new serverLog("SERVER");
         
@@ -403,11 +403,17 @@ public final class serverCore extends serverAbstractThread implements serverThre
         String cIP = clientAddress(controlSocket);
         //System.out.println("server bfHosts=" + bfHost.toString());
         if (bfHost.get(cIP) != null) {
-            this.log.logInfo("SLOWING DOWN ACCESS FOR BRUTE-FORCE PREVENTION FROM " + cIP);
+            Integer attempts = (Integer) bfHost.get(cIP);
+            if (attempts == null) attempts = new Integer(1); else attempts = new Integer(attempts.intValue() + 1);
+            bfHost.put(cIP, attempts);
+            this.log.logInfo("SLOWING DOWN ACCESS FOR BRUTE-FORCE PREVENTION FROM " + cIP + ", ATTEMPT " + attempts.intValue());
             // add a delay to make brute-force harder
             announceThreadBlockApply();
-            try {Thread.sleep(3000);} catch (InterruptedException e) {}
+            try {Thread.sleep(attempts.intValue() * 2000);} catch (InterruptedException e) {}
             announceThreadBlockRelease();
+            if ((attempts.intValue() >= 10) && (denyHost != null)) {
+                denyHost.put(cIP, "deny");
+            }
         }
         
         if ((this.denyHost == null) || (this.denyHost.get(cIP) == null)) {
diff --git a/source/de/anomic/yacy/yacySeedDB.java b/source/de/anomic/yacy/yacySeedDB.java
index 6ee0b1c79..74bb976aa 100644
--- a/source/de/anomic/yacy/yacySeedDB.java
+++ b/source/de/anomic/yacy/yacySeedDB.java
@@ -338,7 +338,7 @@ public class yacySeedDB {
     public long countPotentialURL() { return seedPotentialDB.getAcc("LCount"); }
     public long countPotentialRWI() { return seedPotentialDB.getAcc("ICount"); }
 
-    public void addConnected(yacySeed seed) {
+    public synchronized void addConnected(yacySeed seed) {
 	if ((seed == null) || (!(seed.isProper()))) return;
         //seed.put("LastSeen", yacyCore.shortFormatter.format(new Date(yacyCore.universalTime())));
         try {
@@ -361,7 +361,7 @@ public class yacySeedDB {
 	}
     }
     
-    public void addDisconnected(yacySeed seed) {
+    public synchronized void addDisconnected(yacySeed seed) {
 	if (seed == null) return;
         try {
             nameLookupCache.remove(seed.getName());
@@ -386,7 +386,7 @@ public class yacySeedDB {
 	}
     }
     
-    public void addPotential(yacySeed seed) {
+    public synchronized void addPotential(yacySeed seed) {
         if (seed == null) return;
         try {
             nameLookupCache.remove(seed.getName());