mirror of
https://github.com/minio/minio.git
synced 2025-10-31 00:01:27 +01: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
93 lines
2.2 KiB
Go
93 lines
2.2 KiB
Go
// Copyright (c) 2015-2023 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 (
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
|
|
"github.com/minio/madmin-go/v3/estream"
|
|
)
|
|
|
|
type keepFileErr struct {
|
|
error
|
|
}
|
|
|
|
func extractInspectV2(pk []byte, r io.Reader, w io.Writer, okMsg string) error {
|
|
privKey, err := bytesToPrivateKey(pk)
|
|
if err != nil {
|
|
return fmt.Errorf("decoding key returned: %w", err)
|
|
}
|
|
|
|
sr, err := estream.NewReader(r)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
sr.SetPrivateKey(privKey)
|
|
sr.ReturnNonDecryptable(true)
|
|
|
|
// Debug corrupted streams.
|
|
if false {
|
|
sr.SkipEncrypted(true)
|
|
return sr.DebugStream(os.Stdout)
|
|
}
|
|
extracted := false
|
|
for {
|
|
stream, err := sr.NextStream()
|
|
if err != nil {
|
|
if err == io.EOF {
|
|
if extracted {
|
|
return nil
|
|
}
|
|
return errors.New("no data found on stream")
|
|
}
|
|
if errors.Is(err, estream.ErrNoKey) {
|
|
if stream.Name == "inspect.zip" {
|
|
return errors.New("incorrect private key")
|
|
}
|
|
if err := stream.Skip(); err != nil {
|
|
return fmt.Errorf("stream skip: %w", err)
|
|
}
|
|
continue
|
|
}
|
|
if extracted {
|
|
return keepFileErr{fmt.Errorf("next stream: %w", err)}
|
|
}
|
|
return fmt.Errorf("next stream: %w", err)
|
|
}
|
|
if stream.Name == "inspect.zip" {
|
|
if extracted {
|
|
return keepFileErr{errors.New("multiple inspect.zip streams found")}
|
|
}
|
|
_, err := io.Copy(w, stream)
|
|
if err != nil {
|
|
return fmt.Errorf("reading inspect stream: %w", err)
|
|
}
|
|
fmt.Println(okMsg)
|
|
extracted = true
|
|
continue
|
|
}
|
|
if err := stream.Skip(); err != nil {
|
|
return fmt.Errorf("stream skip: %w", err)
|
|
}
|
|
}
|
|
}
|