octoleo
/
restic
mirror of https://github.com/octoleo/restic.git
2
2
Fork 0
Code Issues Releases Wiki Activity
6,192 Commits 7 Branches 33 Tags 64 MiB
Commit Graph

148 Commits

Author SHA1 Message Date
Michael Eischer aea9f7d286 clarify verbose password prompt 2020-09-30 17:25:54 +02:00
Fred 206cadfab4 Hide password from repository URLs 2020-09-22 22:00:51 +02:00
Michael Eischer 9333f707fa init: use Create method for rclone backend 
This properly issues the initial repository creation command

Fixes #1896
 2020-09-19 19:11:43 +02:00
Alexander Neumann 429f97b887 Set development version for 0.10.0 2020-09-19 17:38:47 +02:00
Alexander Neumann 40832b2927 Add version for 0.10.0 2020-09-19 17:38:26 +02:00
Leo R. Lundgren 311ad2d2d0 Improve wording for --password-file and related options 2020-09-19 15:47:32 +02:00
Leo R. Lundgren ffe6dce7e7 Improve wording for --password-command and --password-command2 options 2020-09-19 14:23:25 +02:00
Pauline Middelink 7048cc3e58 Add copy functionality 
Add a copy command to copy snapshots between repositories. It allows the user
to specify a destination repository, password, password-file, password-command
or key-hint to supply the necessary details to open the destination repository.

You need to supply a list of snapshots to copy, snapshots which already exist
in the destination repository will be skipped.

Note, when using the network this becomes rather slow, as it needs to read the
blocks, decrypt them using the source key, then encrypt them again using the
destination key before finally writing them out to the destination repository.
 2020-08-26 22:17:52 +02:00
Michael Eischer 8f811642c3 Add support for integration tests to wrap the backend 2020-08-16 11:34:01 +02:00
MichaelEischer 84b6f1ec53
Merge pull request #2874 from MichaelEischer/fix-verbose 
Adjust description of --verbose=n parameter
 2020-08-04 23:21:05 +02:00
Michael Eischer e38d415173 Adjust description of --verbose=n parameter 2020-08-04 23:07:53 +02:00
Jakub Wilk 4e6a9767de Fix examples of --verbose with argument 2020-06-23 20:22:14 +02:00
Michael Eischer 1a1c572bac Fix shutdown hang when restic is started as background job 
restic uses a cleanup hook to ensure that it restores the terminal
configuration to a sane state, when restic is interrupted while reading
a password from the terminal. However, this causes a problem, when
restic runs in a background job, as reconfiguring a terminal will cause
a SIGTTOU to be sent to restic pausing it. Therefore, restic seems to
hang on shutdown when it was running in the background.

This commit changes the behavior to only restore the terminal
configuration if restic was interrupted while reading a password from
the terminal. As reading a password from the terminal requires that
restic is in the foreground, this should avoid restic getting stopped.

Fixes #2298
Issue introduced in #402
 2020-04-12 22:27:09 +02:00
Michael Eischer bc74cd3ae5 backup/global: Use proper name for command line argument parameters 
Several paramters printed a generic "string" or "stringArray" name.
 2020-04-03 19:49:04 +02:00
curiousleo f6f240573a Don't Printf already formatted output 
Fixes #2281.
 2020-02-15 01:32:43 +01:00
Alexander Bruyako 688014487b avoid "index out of range" error 
in case of len(format) == 0, we will get an
"index out of range" error
Usage of strings.HasSuffix is allowing to avoid that
 2020-01-27 19:24:42 +03:00
Alexander Neumann 30519f01ff Set development version for 0.9.6 2019-11-22 16:19:03 +01:00
Alexander Neumann b723ca3de5 Add version for 0.9.6 2019-11-22 16:18:59 +01:00
Alexander Neumann fb95426f64 Rename environment variable to AWS_DEFAULT_REGION 
This seems to be the correct name, at least the AWS cli uses it:
https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html
 2019-11-22 15:24:42 +01:00
mdauphin df500a372d Add AWS_REGION env var to specify s3 region 2019-11-22 15:04:48 +01:00
rawtaz 26d1f9f4ba
Merge pull request #2307 from gary-kim/fix-2306-password-retries 
Allow multiple retries for interactive password input
 2019-11-20 18:30:20 +01:00
Jean Kahrs 8066e93f47 updade message that is shown when a cache cleanup is advised 2019-07-02 10:49:49 +02:00
Gary Kim fea2464d4d
Allow multiple retries for interactive password input 
Restic used to quit if the repository password was typed incorrectly once.
Restic will now ask the user again for the repository password if typed incorrectly.
The user will now get three tries to input the correct password before restic quits.
 2019-06-13 20:11:02 +08:00
Alexander Neumann c7762453cf Set development version for 0.9.5 2019-04-23 13:19:43 +02:00
Alexander Neumann 303210aa08 Add version for 0.9.5 2019-04-23 13:19:39 +02:00
Peter Schultz 5715517e29 Fix reading password from stdin 
Reading the password from non-terminal stdin used io.ReadFull with a
byte slice of length 1000.

We are now using a Scanner to read one line of input, independent of its
length.

Additionally, if stdin is not a terminal, the password is read only
once instead of twice (in an effort to detect typos).

Fixes #2203

Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2019-04-15 10:05:49 +02:00
Matthew Holt f645306a18 Initial implementation of JSON progress reporter 2019-02-10 12:09:09 +01:00
Alexander Neumann b96ef48562 Set development version for 0.9.4 2019-01-06 21:40:32 +01:00
Alexander Neumann cd9b2295f1 Add version for 0.9.4 2019-01-06 21:40:32 +01:00
Alexander Neumann 4609b5c24d Merge pull request 2094 from juergenhoetzel/password-command 
Add support for reading password from external command
 2019-01-06 21:14:52 +01:00
Matthew Holt de54618852 cmd: Don't exit if printing to stdout or stderr fails (closes #2102) 2018-12-01 15:11:22 -07:00
Juergen Hoetzel df7f72cdde Add support for reading password from external command 
This allows reading the password from an password manager (like "pass").

Signed-off-by: Juergen Hoetzel <juergen@archlinux.org>
 2018-11-26 20:18:31 +01:00
Chris Howie 1688713400 Add key hinting (#2097) 2018-11-25 09:13:18 -05:00
Alexander Neumann 41a4d67d93 Merge pull request 1962 from mholt/lsjson 
ls: Stream output when using --json option
 2018-10-14 15:51:38 +02:00
Alexander Neumann 167397c18c Set development version for 0.9.3 2018-10-13 13:48:31 +02:00
Alexander Neumann be36c5f150 Add version for 0.9.3 2018-10-13 13:48:31 +02:00
Johannes Hertenstein 0916ff71bd Add defaults to command line help of --cache-dir 2018-10-04 19:50:05 +02:00
Alexander Neumann 6d53e767d5 cache: Print message when new cache is created 
Sometimes, users run restic without retaining the local cache
directories. This was reported several times in the past.

Restic will now print a message whenever a new cache directory is
created from scratch (i.e. it did not exist before), so users have a
chance to recognize when the cache is not kept between different runs of
restic.
 2018-08-29 22:01:10 +02:00
Alexander Neumann 896089976a Fix comment 2018-08-26 19:54:17 +02:00
Alexander Neumann 76387b6cd0 Remove old text table implementation 2018-08-20 22:00:23 +02:00
Matthew Holt 04c67d700d ls: Stream output when using --json option 2018-08-19 00:18:43 -06:00
Alexander Neumann 5a25ad1972 Update version in build.go 2018-08-17 21:17:26 +02:00
Alexander Neumann 3678ec9ad8 Print message for password being read from stdin 
Closes #1911
 2018-07-31 20:21:18 +02:00
Alexander Neumann bfd923e81e rclone: Respect bandwith limits 2018-05-22 20:48:17 +02:00
Alexander Neumann 8026e6fdfb Merge pull request #1749 from restic/add-cache-cmd 
Add 'cache' command to list and cleanup cache dirs
 2018-05-01 21:25:52 +02:00
Alexander Neumann f928aeec34 Add 'cache' command 2018-05-01 16:27:44 +02:00
Alexander Neumann f77bc0fae8 Use textfile.Read() to read files 
This converts the text to UTF-8 and removes a Byte Order Mark.
 2018-05-01 16:25:53 +02:00
Alexander Neumann d8bbe5dc84 Print repository ID after opening 2018-04-30 14:19:07 +02:00
Alexander Neumann 4fb1401266 Fix --cacert help text 2018-04-29 13:17:33 +02:00
Alexander Neumann 0e78ac92d8 Use new archiver code for backup 2018-04-28 22:08:11 +02:00
Alexander Neumann 9fac2ca832 Add flags to set verbosity 2018-04-25 14:42:45 +02:00
Alexander Neumann fe99340e40 Add rclone backend 2018-04-01 10:16:31 +02:00
Lawrence Jones 0dfdc11ed9
Automatically load Google auth 
This change removes the hardcoded Google auth mechanism for the GCS
backend, instead using Google's provided client library to discover and
generate credential material.

Google recommend that client libraries use their common auth mechanism
in order to authorise requests against Google services. Doing so means
you automatically support various types of authentication, from the
standard GOOGLE_APPLICATION_CREDENTIALS environment variable to making
use of Google's metadata API if running within Google Container Engine.
 2018-03-11 17:11:25 +00:00
Alexander Neumann 5dc8d3588d GS: Use generic http transport 
During the development of #1524 I discovered that the Google Cloud
Storage backend did not yet use the HTTP transport, so things such as
bandwidth limiting did not work. This commit does the necessary magic to
make the GS library use our HTTP transport.
 2018-01-27 20:12:34 +01:00
Alexander Neumann c34db983d8 Read TLS client cert and key from the same file 2018-01-27 14:02:01 +01:00
Bryce Chidester e805b968b1 Support for TLS client certificate authentication 
This adds --tls-client-cert and --tls-client-key parameters and enables use
of that certificate/key pair when connecting to https servers.
 2018-01-27 13:18:22 +01:00
Alexander Neumann 0bdb131521 Remove SuspendSignalHandler 2018-01-17 23:14:47 +01:00
Alexander Neumann 18ecd9df30 Improve limiting HTTP based backends 2017-12-29 12:43:49 +01:00
Alexander Neumann 84e493beba b2: Warn when account ID or key is empty 
Closes #1490
 2017-12-19 21:12:38 +01:00
Alexander Neumann 2f26fb8834 Only print cache warning for terminals 2017-12-13 19:58:10 +01:00
Alexander Neumann 3a5e040b7e Merge pull request #1439 from armhold/propagate-context 
replace ad-hoc context.TODO() with gopts.ctx
 2017-12-08 20:27:36 +01:00
George Armhold 1695c8ed55 use global context for check, debug, dump, find, forget, init, key, 
list, mount, tag, unlock commands

gh-1434
 2017-12-06 07:02:55 -05:00
Alexander Neumann ad82781743 Reenable cache 
In 6341c7d72c, the cache was accidentally
disabled due to a bug, this commit reenables the cache.
 2017-12-03 15:52:57 +01:00
George Armhold d886cb5c27 replace ad-hoc context.TODO() with gopts.ctx, so that cancellation 
can properly trickle down from cmd_*.

gh-1434
 2017-12-03 07:22:14 -05:00
Alexander Neumann 6341c7d72c cache: Add option to remove old cache dirs 2017-11-24 20:53:28 +01:00
Alexander Neumann fa893ee477 cache: Add detection code for old cache dirs 2017-11-24 20:53:26 +01:00
Alexander Neumann 897c923cc9 Retry failed backend requests 2017-10-14 15:56:25 +02:00
rmdashrf 32637a0328 Basic rate limiting implementation. 
Added `--limit-upload` and `--limit-download` flags to rate limit
backups and restores.
 2017-10-11 20:01:20 -07:00
Fabian Wickborn 69a6e622d0 Add REST backend option to use CA root certificate 
Closes #1114.
 2017-10-04 22:14:10 +02:00
Anton Lindstrom a7baea0522 Output password successful on terminal stdout 
This removes the conditions that checks if the password is supplied
through environment variable or file and outputs password is successful
on terminal and when --quiet is not supplied.
 2017-10-04 14:55:04 +02:00
Anton Lindstrom 55e6003749 Add password successful feedback 
This adds some feedback when entering the password on the command line.
When the password is entered and supplied through stdin (and stdout is a
terminal) then the a message saying `password is correct` if correct is
printed.
 2017-10-04 13:45:05 +02:00
Alexander Neumann 9be24a1c9f Add cache 
This commits adds rudimentary support for a cache directory, enabled by
default. The cache directory is created if it does not exist. The cache
is used if there's anything in it, newly created snapshot and index
files are written to the cache automatically.
 2017-09-24 21:54:53 +02:00
Alexander Neumann fb9729fdb9 sftp: Allow password entry 
This was a bit tricky: We start the ssh binary, but we want it to ignore
SIGINT. In contrast, restic itself should process SIGINT and clean up
properly. Before, we used `setsid()` to give the ssh process its own
process group, but that means it cannot prompt the user for a password
because the tty is gone.

So, now we're passing in two functions that ignore SIGINT just before
the ssh process is started and re-install it after start.
 2017-09-23 11:43:33 +02:00
Alexander Neumann 36e70228f2 Handle invalid key file 2017-09-10 10:55:01 +02:00
Alexander Neumann b67c178672 Merge pull request #1149 from restic/azure-support 
Add Azure blob storage as backend
 2017-08-09 21:30:35 +02:00
Dipta Das ba75a3884c Add Google Cloud Storage as backend 
Environment variables:
GOOGLE_PROJECT_ID=gcp-project-id
GOOGLE_APPLICATION_CREDENTIALS=path-to-json-file

Environment variables for test:
RESTIC_TEST_GS_PROJECT_ID=gcp-project-id
RESTIC_TEST_GS_APPLICATION_CREDENTIALS=path-to-json-file
RESTIC_TEST_GS_REPOSITORY=gs:us-central1/test-bucket

Init repository:
$ restic -r gs🪣/[prefix] init
 2017-08-06 21:47:55 +02:00
Alexander Neumann d91d89eef6 azure: Create container if it does not exist 2017-08-06 21:47:04 +02:00
Dipta Das 3a85b6b7c6 Add Azure Blob Storage as backend 
Environment variables:
AZURE_ACCOUNT_NAME=storage-account-name
AZURE_ACCOUNT_KEY=storage-account-key

Environment variables for test:
RESTIC_TEST_AZURE_ACCOUNT_NAME=storage-account-name
RESTIC_TEST_AZURE_ACCOUNT_KEY=storage-account-key
RESTIC_TEST_AZURE_REPOSITORY=azure:restic-test-container

Init repository:
$ restic -r azure:container-name:/prefix/dir init
 2017-08-06 21:47:04 +02:00
donat 893bc9f777 Error message in case PasswordFile is missing 2017-07-27 14:23:08 +03:00
Pauline Middelink c95e2b009e Simpify cmd_backup and cmd_init now we have the password in gopts. 2017-07-24 23:32:55 +02:00
Pauline Middelink d5615a67c8 Refactor password resolving. 
Instead of determining the password lazily during ReadPassword(), do so now in
cobra.PersistentPreRunE() so we can store the result in the globalOptions and
reuse/override when applicable without having to worry about the environment
or flag options interfering.
 2017-07-24 23:05:37 +02:00
Alexander Neumann 23c903074c Move restic package to internal/restic 2017-07-24 17:43:32 +02:00
Alexander Neumann 6caeff2408 Run goimports 2017-07-23 14:21:03 +02:00
Alexander Neumann 83d1a46526 Moves files 2017-07-23 14:19:13 +02:00
Alexander Neumann b63399d606 Move things around for gb 
This moves all restic source files to src/, and all vendored
dependencies to vendor/src.
 2016-02-20 17:31:20 +01:00
Alexander Neumann 1287b307ac Add cleanup handler to restore terminal state 
Closes #402
 2016-02-13 18:29:26 +01:00
Alexander Neumann 1dd4c52a8b Add comments, configure flag library 2016-01-17 18:48:05 +01:00
Alexander Neumann 1922a4272c s3: fix usage 
Ignore error response for existing bucket, add more debug code.
 2016-01-17 18:48:05 +01:00
Alexander Neumann 7d5f8214cf use new backend open with config 2016-01-17 18:48:05 +01:00
Alexander Neumann a1440c819b Make NoLock a global option 2015-11-13 12:33:59 +01:00
Alexander Neumann 18d7f7f835 Read password from stdin if terminal is not a tty 2015-11-04 22:20:58 +01:00
Klaus Post 4dc746dac2 Change repository type detection to first check if path is a directory that exists. 
The method of determining if a repository exists doesn't work on Windows, since
the "url.Scheme" will contain the drive letter - "c" in "c:\backup",
so as a first step we check if the URL can be opened as a file,
and if so, we assume it is a 'local' type repository.
 2015-08-14 15:39:16 +02:00
Alexander Neumann 9e9177ab73 Add `build.go` 2015-06-24 20:29:58 +02:00
Alexander Neumann 6c2d6bfd11 Merge pull request #184 from howeyc/backend-s3 
Add Amazon S3 backend.
 2015-06-23 20:14:47 +02:00
Alexander Neumann 675f341b6d Output warnings/errors to configurable writer 2015-06-21 17:40:22 +02:00
Alexander Neumann cfaf8ab8a6 Add integration test for key handling 2015-06-21 17:40:22 +02:00
Alexander Neumann a43733d552 Introduce `Verbosef` 2015-06-21 17:40:22 +02:00
Alexander Neumann 4388474cdc Restructure `cmd/restic`, no functional changes 2015-06-21 17:40:22 +02:00