Sfoglia il codice sorgente

fix formatISO8601, add sanity check to isValidSshPublicKey

tags/2.0.1
Jonathan Cobb 5 anni fa
parent
commit
0316b9e686
2 ha cambiato i file con 4 aggiunte e 1 eliminazioni
  1. +3
    -0
      src/main/java/org/cobbzilla/util/security/RsaKeyPair.java
  2. +1
    -1
      src/main/java/org/cobbzilla/util/time/TimeUtil.java

+ 3
- 0
src/main/java/org/cobbzilla/util/security/RsaKeyPair.java Vedi File

@@ -15,6 +15,7 @@ import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
import static org.cobbzilla.util.daemon.ZillaRuntime.*;
import static org.cobbzilla.util.io.FileUtil.*;
import static org.cobbzilla.util.string.StringUtil.safeShellArg;
import static org.cobbzilla.util.system.Bytes.KB;
import static org.cobbzilla.util.system.CommandShell.exec;
import static org.cobbzilla.util.system.CommandShell.execScript;

@@ -39,6 +40,8 @@ public class RsaKeyPair {
}

public static boolean isValidSshPublicKey (String key) {
// sanity checks, avoid writing large files to disk
if (empty(key) || key.length() < 200 || key.length() > 8*KB) return false;
try {
@Cleanup final TempDir temp = new TempDir();
final File f = FileUtil.toFile(temp+"/key.pub", key);


+ 1
- 1
src/main/java/org/cobbzilla/util/time/TimeUtil.java Vedi File

@@ -76,7 +76,7 @@ public class TimeUtil {
}

public static Long parseISO8601(String val) { return DATE_FORMAT_ISO_8601.parseMillis(val); }
public static String formatISO8601(long val) { return DATE_FORMAT_ISO_8601.print(val); }
public static String formatISO8601(long val) { return new DateTime(val).toString(); }

public static Long parseWithLocale(String val, String locale) {
for (DateTimeFormatter f : DATE_TIME_FORMATS) {


Caricamento…
Annulla
Salva