Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3068 - in trunk/geant2_java-sshtelnet-mp: conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests src/main/java/org/perfsonar/service/measurementPoint/remote/common src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/remote/telnet

Subject: perfsonar development work

List archive

perfsonar: r3068 - in trunk/geant2_java-sshtelnet-mp: conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests src/main/java/org/perfsonar/service/measurementPoint/remote/common src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/remote/telnet


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3068 - in trunk/geant2_java-sshtelnet-mp: conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests src/main/java/org/perfsonar/service/measurementPoint/remote/common src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/remote/telnet
  • Date: Wed, 21 Nov 2007 10:12:57 -0500
Author: melis
Date: 2007-11-21 10:12:56 -0500 (Wed, 21 Nov 2007)
New Revision: 3068

Modified:

trunk/geant2_java-sshtelnet-mp/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests/LookingGlassTypeMeasurementEngineTester.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests/ResponseChecker.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/common/RemoteManager.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshManager.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
Log:
Added support for key based login with a passphrase

Modified:
trunk/geant2_java-sshtelnet-mp/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class
===================================================================
(Binary files differ)

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/CiscoKeyBgpAdapter.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -60,6 +60,8 @@

private String keyUrl = "";

+ private String passphrase = "";
+
private int caching = 0;

// ---------------------- class-fields
@@ -222,6 +224,8 @@
+ ".username");
keyUrl =
properties.getProperty("service.r.mp." + subject
+ ".keyUrl");
+ passphrase =
properties.getProperty("service.r.mp." + subject
+ + ".passphrase");
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

@@ -231,7 +235,9 @@

logger.info("[CiscoKeyBgpAdapter] Trying to connect");

- manager.connect(username, keyUrl);
+ if (passphrase == null || passphrase.equals(""))
+ manager.connect(username, keyUrl);
+ else manager.connect(username, keyUrl, passphrase);
logger.info("[CiscoKeyBgpAdapter] Login");

} catch (Exception e) {

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters/JuniperKeyBgpAdapter.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -60,6 +60,8 @@

private String keyUrl = "";

+ private String passphrase = "";
+
private int caching = 0;

// ---------------------- class-fields
@@ -222,6 +224,8 @@
+ ".username");
keyUrl =
properties.getProperty("service.r.mp." + subject
+ ".keyUrl");
+ passphrase =
properties.getProperty("service.r.mp." + subject
+ + ".passphrase");
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

@@ -231,7 +235,9 @@

logger.info("[JuniperKeyBgpAdapter] Trying to
connect");

- manager.connect(username, keyUrl);
+ if (passphrase == null || passphrase.equals(""))
+ manager.connect(username, keyUrl);
+ else manager.connect(username, keyUrl, passphrase);
logger.info("[JuniperKeyBgpAdapter] Login");

} catch (Exception e) {

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -21,7 +21,6 @@

String previousDevices;

- private static String TEMPFILE = "selectedcommands.sshtemp";
private static String MINIMUM_PACKAGE = "minimumpackage.txt";

public ServicePropertiesConfigurator() {
@@ -37,17 +36,17 @@
BufferedWriter out = null;
out = new BufferedWriter(new FileWriter(outputFile,
true));

- List devices = new ArrayList();
+ //List devices = new ArrayList();

previousDevices = new String(); // devices defined
in given service.properties file

- List types = new ArrayList();
- List commands = new ArrayList();
+ //List types = new ArrayList();
+ //List commands = new ArrayList();

List previousCommands = new ArrayList(); // list of
commands for every device in given
// service.properties (also in String format)

- List allCommands = new ArrayList();
+ //List allCommands = new ArrayList();

out.write("service.ls.registration_file=\n");

@@ -198,6 +197,8 @@
out.write("service.r.mp." + device +
".rate=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".username=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".keyUrl=" + deviceTok.nextToken() + "\n");
+ if (deviceTok.hasMoreTokens())
+ out.write("service.r.mp." +
device + ".passphrase=" + deviceTok.nextToken() +"\n");
out.write("service.r.mp." + device +
".cache=0\n");
} else if
(deviceType.equalsIgnoreCase("junipertelnet")) {
out.write("service.mp."+ device
@@ -228,6 +229,8 @@
out.write("service.r.mp." + device +
".rate=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".username=" + deviceTok.nextToken() + "\n");
out.write("service.r.mp." + device +
".keyUrl=" + deviceTok.nextToken() + "\n");
+ if (deviceTok.hasMoreTokens())
+ out.write("service.r.mp." +
device + ".passphrase=" + deviceTok.nextToken() +"\n");
out.write("service.r.mp." + device +
".cache=0\n");

} else {
@@ -295,11 +298,11 @@
List devices = new ArrayList();

List types = new ArrayList();
- List commands = new ArrayList();
+ //List commands = new ArrayList();

// service.properties (also in String format)

- List allCommands = new ArrayList();
+ //List allCommands = new ArrayList();

System.out.println("First the names of the devices
that have to be supported will " +
"be asked.\nHere you can specify
anything you like, but mostly this is the " +
@@ -584,7 +587,13 @@
}
out.write("service.r.mp." +
device + ".keyUrl=" + input
+ "\n");
-
+ System.out
+ .println("Please provide the
passphrase for the public ssh key. " +
+ "Leave this
blank if you don't have to enter a passphrase.");
+ input = br.readLine();
+ if (input != null &&
!input.equals("")){
+
out.write("service.r.mp." + device + ".passphrase=" + input + "\n");
+ }
}

out.write("service.r.mp." + device +
".cache=0\n");
@@ -947,7 +956,6 @@
} else {
//System.out.println(args[0]);
ServicePropertiesConfigurator stitcher = new
ServicePropertiesConfigurator();
- File file = new File(args[0]);
stitcher.doStuff(args[0]);
//createServiceStorageXML(args[0], args[0] +
"XML.xml");


Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -123,8 +123,7 @@

Metadata[] requestMetadata = request.getMetadataArray();
Data[] requestData = request.getDataArray();
- Subject subject = requestMetadata[0].getSubject();
-
+
if (actionType.equalsIgnoreCase(ActionType.GET_KEY)) {

return createServiceCapabilitiesResponse(request);

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/CiscoKeyIpAdapter.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -62,6 +62,8 @@

private String keyUrl = "";

+ private String passphrase = "";
+
private int caching = 0;

// ---------------------- class-fields
@@ -225,6 +227,8 @@
+ ".username");
keyUrl =
properties.getProperty("service.r.mp." + subject
+ ".keyUrl");
+ passphrase =
properties.getProperty("service.r.mp." + subject
+ + ".passphrase");
if (username.equals("") ||
keyUrl.equals(""))
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Username or
KeyURL not set");
@@ -242,7 +246,9 @@

logger.info("[CiscoKeyIpAdapter] Trying to connect");

- manager.connect(username, keyUrl);
+ if (passphrase == null || passphrase.equals(""))
+ manager.connect(username, keyUrl);
+ else manager.connect(username, keyUrl, passphrase);
logger.info("[CiscoKeyIpAdapter] Login");

} catch (Exception e) {

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters/JuniperKeyIpAdapter.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -62,6 +62,8 @@

private String keyUrl = "";

+ private String passphrase = "";
+
private int caching = 0;

// ---------------------- class-fields
@@ -225,6 +227,8 @@
+ ".username");
keyUrl =
properties.getProperty("service.r.mp." + subject
+ ".keyUrl");
+ passphrase =
properties.getProperty("service.r.mp." + subject
+ + ".passphrase");
if (username.equals("") ||
keyUrl.equals(""))
throw new
PerfSONARException("error.mp.sshtelnet.configuration",
"Username or
KeyURL not set");
@@ -241,8 +245,10 @@
}

logger.info("[JuniperKeyIpAdapter] Trying to
connect");
-
- manager.connect(username, keyUrl);
+
+ if (passphrase == null || passphrase.equals(""))
+ manager.connect(username, keyUrl);
+ else manager.connect(username, keyUrl, passphrase);
logger.info("[JuniperKeyIpAdapter] Login");

} catch (Exception e) {

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/CiscoKeyIpv6Adapter.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -63,6 +63,8 @@

private String keyUrl = "";

+ private String passphrase = "";
+
private int caching = 0;

// ---------------------- class-fields
@@ -225,6 +227,8 @@
+ ".username");
keyUrl =
properties.getProperty("service.r.mp." + subject
+ ".keyUrl");
+ passphrase =
properties.getProperty("service.r.mp." + subject
+ + ".passphrase");
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

@@ -234,7 +238,9 @@

logger.info("[CiscoKeyIpv6Adapter] Trying to
connect");

- manager.connect(username, keyUrl);
+ if (passphrase == null || passphrase.equals(""))
+ manager.connect(username, keyUrl);
+ else manager.connect(username, keyUrl, passphrase);
logger.info("[CiscoKeyIpv6Adapter] Login");

} catch (Exception e) {

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters/JuniperKeyIpv6Adapter.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -63,6 +63,8 @@

private String keyUrl = "";

+ private String passphrase = "";
+
private int caching = 0;

// ---------------------- class-fields
@@ -225,6 +227,8 @@
+ ".username");
keyUrl =
properties.getProperty("service.r.mp." + subject
+ ".keyUrl");
+ passphrase =
properties.getProperty("service.r.mp." + subject
+ + "passphrase");
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

@@ -234,7 +238,9 @@

logger.info("[JuniperKeyIpv6Adapter] Trying to
connect");

- manager.connect(username, keyUrl);
+ if (passphrase == null || passphrase.equals(""))
+ manager.connect(username, keyUrl);
+ else manager.connect(username, keyUrl, passphrase);
logger.info("[JuniperKeyIpv6Adapter] Login");

} catch (Exception e) {

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/CiscoKeyStatusAdapter.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -63,6 +63,8 @@

private String keyUrl = "";

+ private String passphrase = "";
+
private int caching = 0;

// ---------------------- class-fields
@@ -227,6 +229,8 @@
+ ".username");
keyUrl =
properties.getProperty("service.r.mp." + subject
+ ".keyUrl");
+ passphrase =
properties.getProperty("service.r.mp." + subject
+ + ".passphrase");
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

@@ -236,7 +240,9 @@

logger.info("[CiscoKeyStatusAdapter] Trying to
connect");

- manager.connect(username, keyUrl);
+ if (passphrase == null || passphrase.equals(""))
+ manager.connect(username, keyUrl);
+ else manager.connect(username, keyUrl, passphrase);
logger.info("[CiscoKeyStatusAdapter] Login");

} catch (Exception e) {

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters/JuniperKeyStatusAdapter.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -63,6 +63,8 @@

private String keyUrl = "";

+ private String passphrase = "";
+
private int caching = 0;

// ---------------------- class-fields
@@ -227,6 +229,8 @@
+ ".username");
keyUrl =
properties.getProperty("service.r.mp." + subject
+ ".keyUrl");
+ passphrase =
properties.getProperty("service.r.mp." + subject
+ + ".passphrase");
caching =
Integer.parseInt(properties.getProperty("service.r.mp." + subject
+ ".cache"));

@@ -236,7 +240,9 @@

logger.info("[JuniperKeyStatusAdapter] Trying to
connect");

- manager.connect(username, keyUrl);
+ if (passphrase == null || passphrase.equals(""))
+ manager.connect(username, keyUrl);
+ else manager.connect(username, keyUrl, passphrase);
logger.info("[JuniperKeyStatusAdapter] Login");

} catch (Exception e) {

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests/LookingGlassTypeMeasurementEngineTester.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests/LookingGlassTypeMeasurementEngineTester.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests/LookingGlassTypeMeasurementEngineTester.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -48,7 +48,6 @@
String device = (String)params.get("device");
String symbolicCommand =
(String)params.get("symbolicCommand");
String parameterString =
(String)params.get("parameterString");
- String generalConfiguration =
(String)params.get("generalConfiguration");

Message request;


Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests/ResponseChecker.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests/ResponseChecker.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests/ResponseChecker.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -24,8 +24,6 @@
*/
protected String[] responsesList;

- private String accessPoint;
-
private File responsesDirectory;

//
-----------------------------------------------------------------------

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/common/RemoteManager.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/common/RemoteManager.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/common/RemoteManager.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -27,5 +27,7 @@
public String executeCommand(String command) ;

public void disconnect();
+
+ public void connect(String userName, String keyUrl, String
passphrase) throws PerfSONARException;

}

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -57,7 +57,7 @@
try {

logger = (LoggerComponent)
AuxiliaryComponentManager.getInstance()
- .getComponent(ComponentNames.LOGGER);
+ .getComponent(ComponentNames.LOGGER);

} catch (PerfSONARException e1) {

@@ -74,7 +74,7 @@
} catch (PerfSONARException e) {

logger
- .error("[SshKeyManager]
AuthenticationException during connection");
+ .error("[SshKeyManager]
AuthenticationException during connection");

}

@@ -93,7 +93,7 @@

//Set key identity file
jsch.addIdentity(keyUrl);
-
+
//Create session
session = jsch.getSession(userName, url, 22);

@@ -111,7 +111,7 @@

e.printStackTrace();
throw new PerfSONARException(
- "[SshKeyManager] An error occured");
+ "[SshKeyManager] An error occured");

}

@@ -125,7 +125,7 @@
} //connect

public void connect(String username, String keyUrl)
- throws PerfSONARException {
+ throws PerfSONARException {

logger.debug("[SshKeyManager] connecting initiated ...");

@@ -154,12 +154,48 @@

e.printStackTrace();
throw new PerfSONARException(
+ "[SshKeyManager] An error occured");
+
+ }
+
+ } //connect
+
+ public void connect(String username, String keyUrl, String
+ passphrase) throws PerfSONARException {
+
+ logger.debug("[SshKeyManager] connecting initiated ...");
+
+ try {
+
+ //Create a new Client for communication
+ jsch = new JSch();
+
+ //Set key identity file
+ jsch.addIdentity(keyUrl, passphrase);
+
+ //Create session
+ session = jsch.getSession(userName, url, 22);
+
+ //Set user info
+ session.setUserInfo(ui);
+
+ //Connect
+ session.connect();
+
+ connected = true;
+
+ logger.debug("[SshKeyManager] Connection
established");
+
+ } catch (JSchException e) {
+
+ e.printStackTrace();
+ throw new PerfSONARException(
"[SshKeyManager] An error occured");

}

} //connect
-
+
public Channel getSshSessionChannel() {

try {
@@ -219,11 +255,11 @@
} //executeCommand

public void disconnect() {
-
+
session.disconnect();
-
+
} // disconnect
-
+
public static class MyUserInfo implements UserInfo {
public String getPassword() {
return null;

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshManager.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshManager.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshManager.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -64,7 +64,7 @@
try {

logger = (LoggerComponent)
AuxiliaryComponentManager.getInstance()
- .getComponent(ComponentNames.LOGGER);
+ .getComponent(ComponentNames.LOGGER);

} catch (PerfSONARException e1) {

@@ -81,7 +81,7 @@
} catch (PerfSONARException e) {

logger
- .error("[SshManager]
AuthenticationException during connection");
+ .error("[SshManager] AuthenticationException
during connection");

}

@@ -110,16 +110,16 @@

//Set user info
session.setUserInfo(ui);
-
+
//Connect
session.connect();

connected = true;
-
+
} catch (JSchException e) {

logger.error(e.getStackTrace().toString());
-
+
}
}// connect

@@ -143,19 +143,26 @@

//Set user info
session.setUserInfo(ui);
-
+
//Connect
session.connect();

connected = true;
-
+
} catch (JSchException e) {

logger.error(e.getStackTrace().toString());
-
+
}
}// connect

+ public void connect(String username, String keyUrl, String
+ passphrase) throws PerfSONARException {
+
+ connect (username, keyUrl);
+
+ }// connect
+
/**
* Returns the SshChannelClient belonging to this Ssh connection
*
@@ -182,7 +189,7 @@
* command
*/
public String executeCommand(String cmd) {
-
+
String result = "";

try {
@@ -239,23 +246,23 @@
}// disconnect

public void connect(String userName, String passwd)
- throws PerfSONARException {
+ throws PerfSONARException {

connect(userName, "Username:", passwd, "Password:");

}
-
+
public static class MyUserInfo implements UserInfo {
-
+
String passwd;
-
+
public MyUserInfo(String passwd) {
-
+
super();
this.passwd = passwd;
-
+
}
-
+
public String getPassword() {
return passwd;
}

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
2007-11-21 14:06:04 UTC (rev 3067)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
2007-11-21 15:12:56 UTC (rev 3068)
@@ -144,6 +144,13 @@

}//connect

+ public void connect(String username, String keyUrl, String passphrase)
+ throws PerfSONARException {
+
+ connect (username, keyUrl);
+
+ }//connect
+
/**
* This method sets the prompt. This prompt is used to collect all
output
* from the remote operation, ie all output is collected until this
prompt


  • perfsonar: r3068 - in trunk/geant2_java-sshtelnet-mp: conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/bgp/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ip/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/ipv6/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/status/adapters src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/tests src/main/java/org/perfsonar/service/measurementPoint/remote/common src/main/java/org/perfsonar/service/measurementPoint/remote/ssh src/main/java/org/perfsonar/service/measurementPoint/remote/telnet, svnlog, 11/21/2007

Archive powered by MHonArc 2.6.16.

Top of Page