- Timestamp:
- 06/21/11 14:58:21 (13 years ago)
- Location:
- trunk/plugins/DreamboxPlugin
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/plugins/DreamboxPlugin/src/com/bowman/cardserv/AgentSshd.java
r1 r149 1 1 package com.bowman.cardserv; 2 3 import org.apache.sshd.SshServer;4 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;5 import org.apache.sshd.server.*;6 import org.apache.sshd.server.shell.ProcessShellFactory;7 import org.apache.sshd.server.session.ServerSession;8 9 import java.io.*;10 import java.security.PublicKey;11 import java.net.InetSocketAddress;12 import java.util.logging.*;13 import java.util.*;14 2 15 3 import com.bowman.cardserv.interfaces.XmlConfigurable; 16 4 import com.bowman.cardserv.util.ProxyXmlConfig; 5 import org.apache.sshd.SshServer; 6 import org.apache.sshd.server.*; 7 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; 8 import org.apache.sshd.server.session.ServerSession; 9 10 import java.io.IOException; 11 import java.net.InetSocketAddress; 12 import java.security.PublicKey; 13 import java.util.*; 14 import java.util.logging.LogManager; 17 15 18 16 /** … … 53 51 54 52 // sshd.setShellFactory(new ProcessShellFactory(new String[] { "/bin/sh", "-i", "-l" })); 55 sshd.setShellFactory(new DummyShellFactory());53 // sshd.setShellFactory(new DummyShellFactory()); 56 54 57 55 sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider("etc/hostkey.ser")); -
trunk/plugins/DreamboxPlugin/src/com/bowman/cardserv/AgentWeb.java
r136 r149 271 271 if(s.indexOf("{TUNNELPORT}") != -1) s = s.replaceFirst("\\{TUNNELPORT\\}", String.valueOf(parent.getTunnelPort())); 272 272 s = s.replaceFirst("\\{SSHDPORT\\}", String.valueOf(parent.getSshdPort())); 273 s = s.replaceFirst("\\{CPUARCH\\}", parent.getBoxCpuArch(box));273 s = s.replaceFirst("\\{CPUARCH\\}", DreamboxPlugin.getBoxCpuArch(box)); 274 274 s = s.replaceFirst("\\{USERNAME\\}", box.getUser()); 275 275 s = s.replaceFirst("\\{PASSWORD\\}", parent.getUserPasswd(box.getUser())); -
trunk/plugins/DreamboxPlugin/src/com/bowman/cardserv/BoxMetaData.java
r131 r149 88 88 public void setProperty(String name, String value) { 89 89 boxProperties.setProperty(name, value); 90 if("uptime".equals(name) && value != null) 91 if(value.indexOf(", load average: ") != -1) { 92 String load = value.split(", load average: ")[1]; 93 boxProperties.setProperty("load", load); 94 String[] n = load.split(", "); 95 if(n.length == 3) 96 if(!n[0].startsWith("0") && !n[1].startsWith("0") && !n[2].startsWith("0")) { 97 boxProperties.setProperty("cpu-warn", "true"); 98 } else boxProperties.setProperty("cpu-warn", "false"); 99 } 90 100 } 91 101 -
trunk/plugins/DreamboxPlugin/src/com/bowman/cardserv/BoxOperation.java
r132 r149 44 44 45 45 public String getParams() { 46 return params; 46 if(params == null) return ""; 47 else return params; 47 48 } 48 49 -
trunk/plugins/DreamboxPlugin/src/com/bowman/cardserv/DreamboxPlugin.java
r132 r149 283 283 284 284 protected void registerBox(BoxMetaData box) { 285 box.setFileUploadEntry((FileUploadPermission)uploadPermissions.get(box.getUser())); 285 286 registry.registerBox(box); 286 287 } … … 361 362 String p = (String)params.get("params"); 362 363 String of = (String)params.get("filename"); 363 XMLConfig xml = (XMLConfig)params.get("xml");364 String id = (String)params.get("boxid"); 364 365 BoxMetaData box; 365 for(Enumeration e = xml.getMultipleSubConfigs("box"); e.hasMoreElements(); ) { 366 box = registry.getBox(((XMLConfig)e.nextElement()).getString("id")); 366 367 if(id == null) { // no boxid specified, assume this a xml post with multiple boxes 368 XMLConfig xml = (XMLConfig)params.get("xml"); 369 for(Enumeration e = xml.getMultipleSubConfigs("box"); e.hasMoreElements(); ) { 370 box = registry.getBox(((XMLConfig)e.nextElement()).getString("id")); 371 if(box != null) { 372 if(!box.isUploadAllowed(of)) of = null; 373 if("".equals(op) || op == null) box.setPendingOperation(null); 374 else box.setPendingOperation(new BoxOperation(op, p, of)); 375 } 376 } 377 } else { 378 box = registry.getBox(id); 367 379 if(box != null) { 368 380 if(!box.isUploadAllowed(of)) of = null; … … 493 505 String[] props = {"type", "agent-version", "external-ip", "local-ip", "image-guess", "sid", "onid"}; 494 506 for(int i = 0; i < props.length; i++) xb.appendAttr(props[i], box.getProperty(props[i])); 507 if(box.getProperty("load") != null) xb.appendAttr("load", box.getProperty("load")); 508 if("true".equals(box.getProperty("cpu-warn"))) xb.appendAttr("cpu-warn", "true"); 495 509 xb.endElement(true); 496 510 } -
trunk/plugins/DreamboxPlugin/web/open/xslt/cws-status-resp.xsl
r131 r149 75 75 <xsl:attribute name="href">javascript:selectBox('<xsl:value-of select="@id"/>');</xsl:attribute> 76 76 <xsl:value-of select="@type"/> 77 <xsl:if test="@cpu-warn = 'true'"> (!)</xsl:if> 77 78 </a> 78 79 </td>
Note:
See TracChangeset
for help on using the changeset viewer.