From 6e236fe59d91f5e03df9d65e865e893179db05ee Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Thu, 24 Sep 2020 20:21:04 +0200
Subject: [PATCH] Take the password from stdin

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
---
 dist/index.js |  9 +++++----
 src/docker.ts |  4 ++--
 src/exec.ts   | 10 ++++++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 70629c9..b2f0948 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2908,12 +2908,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exec = void 0;
 const actionsExec = __importStar(__webpack_require__(514));
-exports.exec = (command, args = [], silent) => __awaiter(void 0, void 0, void 0, function* () {
+exports.exec = (command, args = [], silent, stdin) => __awaiter(void 0, void 0, void 0, function* () {
     let stdout = '';
     let stderr = '';
     const options = {
         silent: silent,
-        ignoreReturnCode: true
+        ignoreReturnCode: true,
+        input: Buffer.from(stdin || '')
     };
     options.listeners = {
         stdout: (data) => {
@@ -2995,7 +2996,7 @@ function logout(registry) {
 exports.logout = logout;
 function loginStandard(registry, username, password) {
     return __awaiter(this, void 0, void 0, function* () {
-        let loginArgs = ['login', '--password', password];
+        let loginArgs = ['login', '--password-stdin'];
         if (username) {
             loginArgs.push('--username', username);
         }
@@ -3006,7 +3007,7 @@ function loginStandard(registry, username, password) {
         else {
             core.info(`🔑 Logging into DockerHub...`);
         }
-        yield execm.exec('docker', loginArgs, true).then(res => {
+        yield execm.exec('docker', loginArgs, true, password).then(res => {
             if (res.stderr != '' && !res.success) {
                 throw new Error(res.stderr);
             }
diff --git a/src/docker.ts b/src/docker.ts
index d276cbe..369666f 100644
--- a/src/docker.ts
+++ b/src/docker.ts
@@ -19,7 +19,7 @@ export async function logout(registry: string): Promise<void> {
 }
 
 export async function loginStandard(registry: string, username: string, password: string): Promise<void> {
-  let loginArgs: Array<string> = ['login', '--password', password];
+  let loginArgs: Array<string> = ['login', '--password-stdin'];
   if (username) {
     loginArgs.push('--username', username);
   }
@@ -30,7 +30,7 @@ export async function loginStandard(registry: string, username: string, password
   } else {
     core.info(`🔑 Logging into DockerHub...`);
   }
-  await execm.exec('docker', loginArgs, true).then(res => {
+  await execm.exec('docker', loginArgs, true, password).then(res => {
     if (res.stderr != '' && !res.success) {
       throw new Error(res.stderr);
     }
diff --git a/src/exec.ts b/src/exec.ts
index 9ae09ca..f01d22d 100644
--- a/src/exec.ts
+++ b/src/exec.ts
@@ -7,13 +7,19 @@ export interface ExecResult {
   stderr: string;
 }
 
-export const exec = async (command: string, args: string[] = [], silent: boolean): Promise<ExecResult> => {
+export const exec = async (
+  command: string,
+  args: string[] = [],
+  silent: boolean,
+  stdin?: string
+): Promise<ExecResult> => {
   let stdout: string = '';
   let stderr: string = '';
 
   const options: ExecOptions = {
     silent: silent,
-    ignoreReturnCode: true
+    ignoreReturnCode: true,
+    input: Buffer.from(stdin || '')
   };
   options.listeners = {
     stdout: (data: Buffer) => {