mirror of
https://github.com/minio/minio.git
synced 2024-12-26 23:25:54 -05:00
5206c0e883
When no results match or another error occurs, add an error to the stream. Keep the "inspect-input.txt" as the only thing in the zip for reference.
Example:
```
λ mc support inspect --airgap myminio/testbucket/fjghfjh/**
mc: Using public key from C:\Users\klaus\mc\support_public.pem
File data successfully downloaded as inspect-data.enc
λ inspect inspect-data.enc
Using private key from support_private.pem
output written to inspect-data.zip
2024/04/11 14:10:51 next stream: GetRawData: No files matched the given pattern
λ unzip -l inspect-data.zip
Archive: inspect-data.zip
Length Date Time Name
--------- ---------- ----- ----
222 2024-04-11 14:10 inspect-input.txt
--------- -------
222 1 file
λ
```
Modifies inspect to read until end of stream to report the error.
Bonus: Add legacy commandline params
59 lines
1.6 KiB
Go
59 lines
1.6 KiB
Go
// Copyright (c) 2015-2022 MinIO, Inc.
|
|
//
|
|
// This file is part of MinIO Object Storage stack
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package main
|
|
|
|
import (
|
|
"encoding/binary"
|
|
"encoding/hex"
|
|
"fmt"
|
|
"hash/crc32"
|
|
"io"
|
|
|
|
"github.com/secure-io/sio-go"
|
|
)
|
|
|
|
func extractInspectV1(keyHex string, r io.Reader, w io.Writer, okMsg string) error {
|
|
id, err := hex.DecodeString(keyHex[:8])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
key, err := hex.DecodeString(keyHex[8:])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Verify that CRC is ok.
|
|
want := binary.LittleEndian.Uint32(id)
|
|
got := crc32.ChecksumIEEE(key)
|
|
if want != got {
|
|
return fmt.Errorf("Invalid key checksum, want %x, got %x", want, got)
|
|
}
|
|
|
|
stream, err := sio.AES_256_GCM.Stream(key)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Zero nonce, we only use each key once, and 32 bytes is plenty.
|
|
nonce := make([]byte, stream.NonceSize())
|
|
encr := stream.DecryptReader(r, nonce, nil)
|
|
_, err = io.Copy(w, encr)
|
|
if err == nil {
|
|
fmt.Println(okMsg)
|
|
}
|
|
return err
|
|
}
|