- added server-side network unit identification - added server-side network access authorization - enhanced client-side network authentification essentials generation - implemented first peer-peer salted-magic authentification method git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3953 6c8d7289-2bf4-0310-a012-ef5d649a1542pull/1/head
orbiter
18 years ago
parent
a9e73b6852
commit
f40566f9bb
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,101 @@
|
||||
// yacyNetwork.java
|
||||
// ----------------
|
||||
// (C) 2007 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
|
||||
// first published 04.07.2007 on http://yacy.net
|
||||
//
|
||||
// This is a part of YaCy, a peer-to-peer based web search engine
|
||||
//
|
||||
// $LastChangedDate: 2007-07-03 22:55:47 +0000 (Di, 03 Jul 2007) $
|
||||
// $LastChangedRevision: 3950 $
|
||||
// $LastChangedBy: orbiter $
|
||||
//
|
||||
// LICENSE
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package de.anomic.yacy;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
import de.anomic.server.serverCodings;
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.server.serverSwitch;
|
||||
import de.anomic.tools.crypt;
|
||||
|
||||
public class yacyNetwork {
|
||||
|
||||
public static final boolean authentifyRequest(serverObjects post, serverSwitch env) {
|
||||
if ((post == null) || (env == null)) return false;
|
||||
|
||||
// identify network
|
||||
String unitName = post.get("network.unit.name", yacySeed.DFLT_NETWORK_UNIT); // the network unit
|
||||
if (!unitName.equals(env.getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// check authentification method
|
||||
String authentificationControl = env.getConfig("network.unit.protocol.control", "uncontrolled");
|
||||
if (authentificationControl.equals("uncontrolled")) return true;
|
||||
String authentificationMethod = env.getConfig("network.unit.protocol.request.authentification.method", "");
|
||||
if (authentificationMethod.length() == 0) {
|
||||
return false;
|
||||
}
|
||||
if (authentificationMethod.equals("salted-magic-sim")) {
|
||||
// authentify the peer using the md5-magic
|
||||
String salt = post.get("key", "");
|
||||
String iam = post.get("iam", "");
|
||||
String magic = env.getConfig("network.unit.protocol.request.authentification.essentials", "");
|
||||
String md5 = serverCodings.encodeMD5Hex(salt + iam + magic);
|
||||
return post.get("magicmd5", "").equals(md5);
|
||||
}
|
||||
|
||||
// unknown authentification method
|
||||
return false;
|
||||
}
|
||||
|
||||
public static final String enrichRequestPost(serverObjects post, serverSwitch env, String targetHash) {
|
||||
// put in all the essentials for routing and network authentification
|
||||
// generate a session key
|
||||
final String salt = crypt.randomSalt();
|
||||
post.put("key", salt);
|
||||
|
||||
// just standard identification essentials
|
||||
post.put("iam", yacyCore.seedDB.mySeed.hash);
|
||||
if (targetHash != null) post.put("youare", targetHash);
|
||||
|
||||
// time information for synchronization
|
||||
post.put("mytime", yacyCore.universalDateShortString(new Date()));
|
||||
post.put("myUTC", System.currentTimeMillis());
|
||||
|
||||
// network identification
|
||||
post.put("network.unit.name", plasmaSwitchboard.getSwitchboard().getConfig("network.unit.name", yacySeed.DFLT_NETWORK_UNIT));
|
||||
|
||||
// authentification essentials
|
||||
String authentificationControl = env.getConfig("network.unit.protocol.control", "uncontrolled");
|
||||
String authentificationMethod = env.getConfig("network.unit.protocol.request.authentification.method", "");
|
||||
if ((authentificationControl.equals("controlled")) && (authentificationMethod.length() > 0)) {
|
||||
if (authentificationMethod.equals("salted-magic-sim")) {
|
||||
// generate an authentification essential using the salt, the iam-hash and the network magic
|
||||
String magic = env.getConfig("network.unit.protocol.request.authentification.essentials", "");
|
||||
String md5 = serverCodings.encodeMD5Hex(salt + yacyCore.seedDB.mySeed.hash + magic);
|
||||
post.put("magicmd5", md5);
|
||||
}
|
||||
}
|
||||
|
||||
return salt;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in new issue