Rebase to JSS v4.5.3

Signed-off-by: Alexander Scheel <ascheel@redhat.com>
This commit is contained in:
Alexander Scheel 2019-03-19 14:14:43 -04:00
parent 034c971959
commit 0bf2396d8a
No known key found for this signature in database
GPG Key ID: C0D6C737D0003143
4 changed files with 5 additions and 98 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ jss-4.2.6.tar.gz
/jss-4.5.0.tar.gz
/jss-4.5.1.tar.gz
/jss-4.5.2.tar.gz
/jss-4.5.3.tar.gz

View File

@ -1,94 +0,0 @@
From a5b0caf63837acfd876ee15e3823fbfdf5685432 Mon Sep 17 00:00:00 2001
From: Dinesh Prasanth M K <dmoluguw@redhat.com>
Date: Wed, 30 Jan 2019 12:31:29 -0500
Subject: [PATCH] Add exec method to execute shell commands with input
- This is an effort to move duplicate code from PKI code
base to JSS code base
- This chunk of code was originally introduced in PKI
code: https://github.com/dogtagpki/pki/pull/131
- This PR is a joined effort of:
https://github.com/dogtagpki/pki/pull/122
Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>
---
.../jss/netscape/security/util/Utils.java | 57 +++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/org/mozilla/jss/netscape/security/util/Utils.java b/org/mozilla/jss/netscape/security/util/Utils.java
index b1a3c341..b45381ae 100644
--- a/org/mozilla/jss/netscape/security/util/Utils.java
+++ b/org/mozilla/jss/netscape/security/util/Utils.java
@@ -25,6 +25,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
@@ -96,6 +97,62 @@ public static boolean exec(String cmd) {
return false;
}
+ public static String readFromStream(InputStream inputStream) throws IOException {
+ StringBuilder sb = new StringBuilder();
+ BufferedReader br = null;
+ try {
+ br = new BufferedReader(new InputStreamReader(inputStream));
+ String line = null;
+ while ((line = br.readLine()) != null) {
+ sb.append(line + System.getProperty("line.separator"));
+ }
+ } finally {
+ br.close();
+ }
+ return sb.toString().trim();
+ }
+
+ public static void writeToStream(OutputStream outputStream, String input) throws IOException {
+ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(outputStream));
+ writer.write(input);
+ writer.flush();
+ writer.close();
+ }
+
+ /**
+ * Utility method to execute system commands
+ *
+ * @param cmd The command to be executed and its arguments
+ * @param input The stdin input to be passed to the cmd
+ * @return stdout or stderr of the command executed
+ * @throws IOException
+ * @throws InterruptedException
+ */
+ public static String exec(String[] cmd, String input) throws IOException, InterruptedException {
+
+ ProcessBuilder pb = new ProcessBuilder(cmd);
+
+ Process p = pb.start();
+
+ if (input != null) {
+ writeToStream(p.getOutputStream(), input);
+ }
+
+ p.waitFor();
+
+ String output;
+ if (p.exitValue() == 0) {
+ output = readFromStream(p.getInputStream());
+ } else {
+ output = readFromStream(p.getErrorStream());
+ }
+ p.destroy();
+
+ return output;
+ }
+
+
+
public static String SpecialURLDecode(String s) {
if (s == null)
return null;

View File

@ -6,8 +6,8 @@ Summary: Java Security Services (JSS)
URL: http://www.dogtagpki.org/wiki/JSS
License: MPLv1.1 or GPLv2+ or LGPLv2+
Version: 4.5.2
Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
Version: 4.5.3
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To generate the source tarball:
@ -26,7 +26,7 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
# <version tag> \
# > jss-VERSION-RELEASE.patch
# Patch: jss-VERSION-RELEASE.patch
Patch1: jss-pki-sync-netscape-security-util-Utils.patch
# Patch1: jss-pki-sync-netscape-security-util-Utils.patch
################################################################################
# Build Dependencies

View File

@ -1 +1 @@
SHA512 (jss-4.5.2.tar.gz) = 344b31a218b7aebb15cc24e24d5697978889bf37856ddefc9521899d2a2a80b1bc9ed0b498a6e0cd19deed169fe1bc56f1ad42e7b8cfc188fadd28245d7bec31
SHA512 (jss-4.5.3.tar.gz) = 6a5d5065803a36a42f15c19fa870edf4844d650911c690a8033288ee0e2e6e115868de39a7c9c955e068568a859baf5fb3e8e970b4167dfc19782bb661ab6d71