Merge pull request #964 from restic/update-minio-go
Update github.com/minio/minio-go
This commit is contained in:
commit
22a6cd3a26
67 changed files with 8126 additions and 240 deletions
14
vendor/manifest
vendored
14
vendor/manifest
vendored
|
@ -13,6 +13,12 @@
|
||||||
"revision": "2325946f714c95de4a6088202c402fbdfa64163b",
|
"revision": "2325946f714c95de4a6088202c402fbdfa64163b",
|
||||||
"branch": "master"
|
"branch": "master"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"importpath": "github.com/go-ini/ini",
|
||||||
|
"repository": "https://github.com/go-ini/ini",
|
||||||
|
"revision": "e7fea39b01aea8d5671f6858f0532f56e8bff3a5",
|
||||||
|
"branch": "master"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"importpath": "github.com/inconshreveable/mousetrap",
|
"importpath": "github.com/inconshreveable/mousetrap",
|
||||||
"repository": "https://github.com/inconshreveable/mousetrap",
|
"repository": "https://github.com/inconshreveable/mousetrap",
|
||||||
|
@ -25,10 +31,16 @@
|
||||||
"revision": "2788f0dbd16903de03cb8186e5c7d97b69ad387b",
|
"revision": "2788f0dbd16903de03cb8186e5c7d97b69ad387b",
|
||||||
"branch": "master"
|
"branch": "master"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"importpath": "github.com/minio/go-homedir",
|
||||||
|
"repository": "https://github.com/minio/go-homedir",
|
||||||
|
"revision": "0b1069c753c94b3633cc06a1995252dbcc27c7a6",
|
||||||
|
"branch": "master"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"importpath": "github.com/minio/minio-go",
|
"importpath": "github.com/minio/minio-go",
|
||||||
"repository": "https://github.com/minio/minio-go",
|
"repository": "https://github.com/minio/minio-go",
|
||||||
"revision": "2f03abaa07d8bc57faef16cda7655ea62a7e0bed",
|
"revision": "85f15b007f08e11a62c769abe65299b812fd2e0d",
|
||||||
"branch": "master"
|
"branch": "master"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
191
vendor/src/github.com/go-ini/ini/LICENSE
vendored
Normal file
191
vendor/src/github.com/go-ini/ini/LICENSE
vendored
Normal file
|
@ -0,0 +1,191 @@
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction, and
|
||||||
|
distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by the copyright
|
||||||
|
owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all other entities
|
||||||
|
that control, are controlled by, or are under common control with that entity.
|
||||||
|
For the purposes of this definition, "control" means (i) the power, direct or
|
||||||
|
indirect, to cause the direction or management of such entity, whether by
|
||||||
|
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity exercising
|
||||||
|
permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications, including
|
||||||
|
but not limited to software source code, documentation source, and configuration
|
||||||
|
files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical transformation or
|
||||||
|
translation of a Source form, including but not limited to compiled object code,
|
||||||
|
generated documentation, and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or Object form, made
|
||||||
|
available under the License, as indicated by a copyright notice that is included
|
||||||
|
in or attached to the work (an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object form, that
|
||||||
|
is based on (or derived from) the Work and for which the editorial revisions,
|
||||||
|
annotations, elaborations, or other modifications represent, as a whole, an
|
||||||
|
original work of authorship. For the purposes of this License, Derivative Works
|
||||||
|
shall not include works that remain separable from, or merely link (or bind by
|
||||||
|
name) to the interfaces of, the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including the original version
|
||||||
|
of the Work and any modifications or additions to that Work or Derivative Works
|
||||||
|
thereof, that is intentionally submitted to Licensor for inclusion in the Work
|
||||||
|
by the copyright owner or by an individual or Legal Entity authorized to submit
|
||||||
|
on behalf of the copyright owner. For the purposes of this definition,
|
||||||
|
"submitted" means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems, and
|
||||||
|
issue tracking systems that are managed by, or on behalf of, the Licensor for
|
||||||
|
the purpose of discussing and improving the Work, but excluding communication
|
||||||
|
that is conspicuously marked or otherwise designated in writing by the copyright
|
||||||
|
owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
|
||||||
|
of whom a Contribution has been received by Licensor and subsequently
|
||||||
|
incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License.
|
||||||
|
|
||||||
|
Subject to the terms and conditions of this License, each Contributor hereby
|
||||||
|
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
|
||||||
|
irrevocable copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the Work and such
|
||||||
|
Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License.
|
||||||
|
|
||||||
|
Subject to the terms and conditions of this License, each Contributor hereby
|
||||||
|
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
|
||||||
|
irrevocable (except as stated in this section) patent license to make, have
|
||||||
|
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
|
||||||
|
such license applies only to those patent claims licensable by such Contributor
|
||||||
|
that are necessarily infringed by their Contribution(s) alone or by combination
|
||||||
|
of their Contribution(s) with the Work to which such Contribution(s) was
|
||||||
|
submitted. If You institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
|
||||||
|
Contribution incorporated within the Work constitutes direct or contributory
|
||||||
|
patent infringement, then any patent licenses granted to You under this License
|
||||||
|
for that Work shall terminate as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution.
|
||||||
|
|
||||||
|
You may reproduce and distribute copies of the Work or Derivative Works thereof
|
||||||
|
in any medium, with or without modifications, and in Source or Object form,
|
||||||
|
provided that You meet the following conditions:
|
||||||
|
|
||||||
|
You must give any other recipients of the Work or Derivative Works a copy of
|
||||||
|
this License; and
|
||||||
|
You must cause any modified files to carry prominent notices stating that You
|
||||||
|
changed the files; and
|
||||||
|
You must retain, in the Source form of any Derivative Works that You distribute,
|
||||||
|
all copyright, patent, trademark, and attribution notices from the Source form
|
||||||
|
of the Work, excluding those notices that do not pertain to any part of the
|
||||||
|
Derivative Works; and
|
||||||
|
If the Work includes a "NOTICE" text file as part of its distribution, then any
|
||||||
|
Derivative Works that You distribute must include a readable copy of the
|
||||||
|
attribution notices contained within such NOTICE file, excluding those notices
|
||||||
|
that do not pertain to any part of the Derivative Works, in at least one of the
|
||||||
|
following places: within a NOTICE text file distributed as part of the
|
||||||
|
Derivative Works; within the Source form or documentation, if provided along
|
||||||
|
with the Derivative Works; or, within a display generated by the Derivative
|
||||||
|
Works, if and wherever such third-party notices normally appear. The contents of
|
||||||
|
the NOTICE file are for informational purposes only and do not modify the
|
||||||
|
License. You may add Your own attribution notices within Derivative Works that
|
||||||
|
You distribute, alongside or as an addendum to the NOTICE text from the Work,
|
||||||
|
provided that such additional attribution notices cannot be construed as
|
||||||
|
modifying the License.
|
||||||
|
You may add Your own copyright statement to Your modifications and may provide
|
||||||
|
additional or different license terms and conditions for use, reproduction, or
|
||||||
|
distribution of Your modifications, or for any such Derivative Works as a whole,
|
||||||
|
provided Your use, reproduction, and distribution of the Work otherwise complies
|
||||||
|
with the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions.
|
||||||
|
|
||||||
|
Unless You explicitly state otherwise, any Contribution intentionally submitted
|
||||||
|
for inclusion in the Work by You to the Licensor shall be under the terms and
|
||||||
|
conditions of this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify the terms of
|
||||||
|
any separate license agreement you may have executed with Licensor regarding
|
||||||
|
such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks.
|
||||||
|
|
||||||
|
This License does not grant permission to use the trade names, trademarks,
|
||||||
|
service marks, or product names of the Licensor, except as required for
|
||||||
|
reasonable and customary use in describing the origin of the Work and
|
||||||
|
reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, Licensor provides the
|
||||||
|
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
|
||||||
|
including, without limitation, any warranties or conditions of TITLE,
|
||||||
|
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
|
||||||
|
solely responsible for determining the appropriateness of using or
|
||||||
|
redistributing the Work and assume any risks associated with Your exercise of
|
||||||
|
permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability.
|
||||||
|
|
||||||
|
In no event and under no legal theory, whether in tort (including negligence),
|
||||||
|
contract, or otherwise, unless required by applicable law (such as deliberate
|
||||||
|
and grossly negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special, incidental,
|
||||||
|
or consequential damages of any character arising as a result of this License or
|
||||||
|
out of the use or inability to use the Work (including but not limited to
|
||||||
|
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
|
||||||
|
any and all other commercial damages or losses), even if such Contributor has
|
||||||
|
been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability.
|
||||||
|
|
||||||
|
While redistributing the Work or Derivative Works thereof, You may choose to
|
||||||
|
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
|
||||||
|
other liability obligations and/or rights consistent with this License. However,
|
||||||
|
in accepting such obligations, You may act only on Your own behalf and on Your
|
||||||
|
sole responsibility, not on behalf of any other Contributor, and only if You
|
||||||
|
agree to indemnify, defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason of your
|
||||||
|
accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following boilerplate
|
||||||
|
notice, with the fields enclosed by brackets "[]" replaced with your own
|
||||||
|
identifying information. (Don't include the brackets!) The text should be
|
||||||
|
enclosed in the appropriate comment syntax for the file format. We also
|
||||||
|
recommend that a file or class name and description of purpose be included on
|
||||||
|
the same "printed page" as the copyright notice for easier identification within
|
||||||
|
third-party archives.
|
||||||
|
|
||||||
|
Copyright [yyyy] [name of copyright owner]
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
12
vendor/src/github.com/go-ini/ini/Makefile
vendored
Normal file
12
vendor/src/github.com/go-ini/ini/Makefile
vendored
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
.PHONY: build test bench vet
|
||||||
|
|
||||||
|
build: vet bench
|
||||||
|
|
||||||
|
test:
|
||||||
|
go test -v -cover -race
|
||||||
|
|
||||||
|
bench:
|
||||||
|
go test -v -cover -race -test.bench=. -test.benchmem
|
||||||
|
|
||||||
|
vet:
|
||||||
|
go vet
|
740
vendor/src/github.com/go-ini/ini/README.md
vendored
Normal file
740
vendor/src/github.com/go-ini/ini/README.md
vendored
Normal file
|
@ -0,0 +1,740 @@
|
||||||
|
INI [![Build Status](https://travis-ci.org/go-ini/ini.svg?branch=master)](https://travis-ci.org/go-ini/ini) [![Sourcegraph](https://sourcegraph.com/github.com/go-ini/ini/-/badge.svg)](https://sourcegraph.com/github.com/go-ini/ini?badge)
|
||||||
|
===
|
||||||
|
|
||||||
|
![](https://avatars0.githubusercontent.com/u/10216035?v=3&s=200)
|
||||||
|
|
||||||
|
Package ini provides INI file read and write functionality in Go.
|
||||||
|
|
||||||
|
[简体中文](README_ZH.md)
|
||||||
|
|
||||||
|
## Feature
|
||||||
|
|
||||||
|
- Load multiple data sources(`[]byte`, file and `io.ReadCloser`) with overwrites.
|
||||||
|
- Read with recursion values.
|
||||||
|
- Read with parent-child sections.
|
||||||
|
- Read with auto-increment key names.
|
||||||
|
- Read with multiple-line values.
|
||||||
|
- Read with tons of helper methods.
|
||||||
|
- Read and convert values to Go types.
|
||||||
|
- Read and **WRITE** comments of sections and keys.
|
||||||
|
- Manipulate sections, keys and comments with ease.
|
||||||
|
- Keep sections and keys in order as you parse and save.
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
To use a tagged revision:
|
||||||
|
|
||||||
|
go get gopkg.in/ini.v1
|
||||||
|
|
||||||
|
To use with latest changes:
|
||||||
|
|
||||||
|
go get github.com/go-ini/ini
|
||||||
|
|
||||||
|
Please add `-u` flag to update in the future.
|
||||||
|
|
||||||
|
### Testing
|
||||||
|
|
||||||
|
If you want to test on your machine, please apply `-t` flag:
|
||||||
|
|
||||||
|
go get -t gopkg.in/ini.v1
|
||||||
|
|
||||||
|
Please add `-u` flag to update in the future.
|
||||||
|
|
||||||
|
## Getting Started
|
||||||
|
|
||||||
|
### Loading from data sources
|
||||||
|
|
||||||
|
A **Data Source** is either raw data in type `[]byte`, a file name with type `string` or `io.ReadCloser`. You can load **as many data sources as you want**. Passing other types will simply return an error.
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := ini.Load([]byte("raw data"), "filename", ioutil.NopCloser(bytes.NewReader([]byte("some other data"))))
|
||||||
|
```
|
||||||
|
|
||||||
|
Or start with an empty object:
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg := ini.Empty()
|
||||||
|
```
|
||||||
|
|
||||||
|
When you cannot decide how many data sources to load at the beginning, you will still be able to **Append()** them later.
|
||||||
|
|
||||||
|
```go
|
||||||
|
err := cfg.Append("other file", []byte("other raw data"))
|
||||||
|
```
|
||||||
|
|
||||||
|
If you have a list of files with possibilities that some of them may not available at the time, and you don't know exactly which ones, you can use `LooseLoad` to ignore nonexistent files without returning error.
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := ini.LooseLoad("filename", "filename_404")
|
||||||
|
```
|
||||||
|
|
||||||
|
The cool thing is, whenever the file is available to load while you're calling `Reload` method, it will be counted as usual.
|
||||||
|
|
||||||
|
#### Ignore cases of key name
|
||||||
|
|
||||||
|
When you do not care about cases of section and key names, you can use `InsensitiveLoad` to force all names to be lowercased while parsing.
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := ini.InsensitiveLoad("filename")
|
||||||
|
//...
|
||||||
|
|
||||||
|
// sec1 and sec2 are the exactly same section object
|
||||||
|
sec1, err := cfg.GetSection("Section")
|
||||||
|
sec2, err := cfg.GetSection("SecTIOn")
|
||||||
|
|
||||||
|
// key1 and key2 are the exactly same key object
|
||||||
|
key1, err := cfg.GetKey("Key")
|
||||||
|
key2, err := cfg.GetKey("KeY")
|
||||||
|
```
|
||||||
|
|
||||||
|
#### MySQL-like boolean key
|
||||||
|
|
||||||
|
MySQL's configuration allows a key without value as follows:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[mysqld]
|
||||||
|
...
|
||||||
|
skip-host-cache
|
||||||
|
skip-name-resolve
|
||||||
|
```
|
||||||
|
|
||||||
|
By default, this is considered as missing value. But if you know you're going to deal with those cases, you can assign advanced load options:
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := LoadSources(LoadOptions{AllowBooleanKeys: true}, "my.cnf"))
|
||||||
|
```
|
||||||
|
|
||||||
|
The value of those keys are always `true`, and when you save to a file, it will keep in the same foramt as you read.
|
||||||
|
|
||||||
|
To generate such keys in your program, you could use `NewBooleanKey`:
|
||||||
|
|
||||||
|
```go
|
||||||
|
key, err := sec.NewBooleanKey("skip-host-cache")
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Comment
|
||||||
|
|
||||||
|
Take care that following format will be treated as comment:
|
||||||
|
|
||||||
|
1. Line begins with `#` or `;`
|
||||||
|
2. Words after `#` or `;`
|
||||||
|
3. Words after section name (i.e words after `[some section name]`)
|
||||||
|
|
||||||
|
If you want to save a value with `#` or `;`, please quote them with ``` ` ``` or ``` """ ```.
|
||||||
|
|
||||||
|
### Working with sections
|
||||||
|
|
||||||
|
To get a section, you would need to:
|
||||||
|
|
||||||
|
```go
|
||||||
|
section, err := cfg.GetSection("section name")
|
||||||
|
```
|
||||||
|
|
||||||
|
For a shortcut for default section, just give an empty string as name:
|
||||||
|
|
||||||
|
```go
|
||||||
|
section, err := cfg.GetSection("")
|
||||||
|
```
|
||||||
|
|
||||||
|
When you're pretty sure the section exists, following code could make your life easier:
|
||||||
|
|
||||||
|
```go
|
||||||
|
section := cfg.Section("section name")
|
||||||
|
```
|
||||||
|
|
||||||
|
What happens when the section somehow does not exist? Don't panic, it automatically creates and returns a new section to you.
|
||||||
|
|
||||||
|
To create a new section:
|
||||||
|
|
||||||
|
```go
|
||||||
|
err := cfg.NewSection("new section")
|
||||||
|
```
|
||||||
|
|
||||||
|
To get a list of sections or section names:
|
||||||
|
|
||||||
|
```go
|
||||||
|
sections := cfg.Sections()
|
||||||
|
names := cfg.SectionStrings()
|
||||||
|
```
|
||||||
|
|
||||||
|
### Working with keys
|
||||||
|
|
||||||
|
To get a key under a section:
|
||||||
|
|
||||||
|
```go
|
||||||
|
key, err := cfg.Section("").GetKey("key name")
|
||||||
|
```
|
||||||
|
|
||||||
|
Same rule applies to key operations:
|
||||||
|
|
||||||
|
```go
|
||||||
|
key := cfg.Section("").Key("key name")
|
||||||
|
```
|
||||||
|
|
||||||
|
To check if a key exists:
|
||||||
|
|
||||||
|
```go
|
||||||
|
yes := cfg.Section("").HasKey("key name")
|
||||||
|
```
|
||||||
|
|
||||||
|
To create a new key:
|
||||||
|
|
||||||
|
```go
|
||||||
|
err := cfg.Section("").NewKey("name", "value")
|
||||||
|
```
|
||||||
|
|
||||||
|
To get a list of keys or key names:
|
||||||
|
|
||||||
|
```go
|
||||||
|
keys := cfg.Section("").Keys()
|
||||||
|
names := cfg.Section("").KeyStrings()
|
||||||
|
```
|
||||||
|
|
||||||
|
To get a clone hash of keys and corresponding values:
|
||||||
|
|
||||||
|
```go
|
||||||
|
hash := cfg.Section("").KeysHash()
|
||||||
|
```
|
||||||
|
|
||||||
|
### Working with values
|
||||||
|
|
||||||
|
To get a string value:
|
||||||
|
|
||||||
|
```go
|
||||||
|
val := cfg.Section("").Key("key name").String()
|
||||||
|
```
|
||||||
|
|
||||||
|
To validate key value on the fly:
|
||||||
|
|
||||||
|
```go
|
||||||
|
val := cfg.Section("").Key("key name").Validate(func(in string) string {
|
||||||
|
if len(in) == 0 {
|
||||||
|
return "default"
|
||||||
|
}
|
||||||
|
return in
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
If you do not want any auto-transformation (such as recursive read) for the values, you can get raw value directly (this way you get much better performance):
|
||||||
|
|
||||||
|
```go
|
||||||
|
val := cfg.Section("").Key("key name").Value()
|
||||||
|
```
|
||||||
|
|
||||||
|
To check if raw value exists:
|
||||||
|
|
||||||
|
```go
|
||||||
|
yes := cfg.Section("").HasValue("test value")
|
||||||
|
```
|
||||||
|
|
||||||
|
To get value with types:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// For boolean values:
|
||||||
|
// true when value is: 1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On
|
||||||
|
// false when value is: 0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off
|
||||||
|
v, err = cfg.Section("").Key("BOOL").Bool()
|
||||||
|
v, err = cfg.Section("").Key("FLOAT64").Float64()
|
||||||
|
v, err = cfg.Section("").Key("INT").Int()
|
||||||
|
v, err = cfg.Section("").Key("INT64").Int64()
|
||||||
|
v, err = cfg.Section("").Key("UINT").Uint()
|
||||||
|
v, err = cfg.Section("").Key("UINT64").Uint64()
|
||||||
|
v, err = cfg.Section("").Key("TIME").TimeFormat(time.RFC3339)
|
||||||
|
v, err = cfg.Section("").Key("TIME").Time() // RFC3339
|
||||||
|
|
||||||
|
v = cfg.Section("").Key("BOOL").MustBool()
|
||||||
|
v = cfg.Section("").Key("FLOAT64").MustFloat64()
|
||||||
|
v = cfg.Section("").Key("INT").MustInt()
|
||||||
|
v = cfg.Section("").Key("INT64").MustInt64()
|
||||||
|
v = cfg.Section("").Key("UINT").MustUint()
|
||||||
|
v = cfg.Section("").Key("UINT64").MustUint64()
|
||||||
|
v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339)
|
||||||
|
v = cfg.Section("").Key("TIME").MustTime() // RFC3339
|
||||||
|
|
||||||
|
// Methods start with Must also accept one argument for default value
|
||||||
|
// when key not found or fail to parse value to given type.
|
||||||
|
// Except method MustString, which you have to pass a default value.
|
||||||
|
|
||||||
|
v = cfg.Section("").Key("String").MustString("default")
|
||||||
|
v = cfg.Section("").Key("BOOL").MustBool(true)
|
||||||
|
v = cfg.Section("").Key("FLOAT64").MustFloat64(1.25)
|
||||||
|
v = cfg.Section("").Key("INT").MustInt(10)
|
||||||
|
v = cfg.Section("").Key("INT64").MustInt64(99)
|
||||||
|
v = cfg.Section("").Key("UINT").MustUint(3)
|
||||||
|
v = cfg.Section("").Key("UINT64").MustUint64(6)
|
||||||
|
v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339, time.Now())
|
||||||
|
v = cfg.Section("").Key("TIME").MustTime(time.Now()) // RFC3339
|
||||||
|
```
|
||||||
|
|
||||||
|
What if my value is three-line long?
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[advance]
|
||||||
|
ADDRESS = """404 road,
|
||||||
|
NotFound, State, 5000
|
||||||
|
Earth"""
|
||||||
|
```
|
||||||
|
|
||||||
|
Not a problem!
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("advance").Key("ADDRESS").String()
|
||||||
|
|
||||||
|
/* --- start ---
|
||||||
|
404 road,
|
||||||
|
NotFound, State, 5000
|
||||||
|
Earth
|
||||||
|
------ end --- */
|
||||||
|
```
|
||||||
|
|
||||||
|
That's cool, how about continuation lines?
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[advance]
|
||||||
|
two_lines = how about \
|
||||||
|
continuation lines?
|
||||||
|
lots_of_lines = 1 \
|
||||||
|
2 \
|
||||||
|
3 \
|
||||||
|
4
|
||||||
|
```
|
||||||
|
|
||||||
|
Piece of cake!
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("advance").Key("two_lines").String() // how about continuation lines?
|
||||||
|
cfg.Section("advance").Key("lots_of_lines").String() // 1 2 3 4
|
||||||
|
```
|
||||||
|
|
||||||
|
Well, I hate continuation lines, how do I disable that?
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := ini.LoadSources(ini.LoadOptions{
|
||||||
|
IgnoreContinuation: true,
|
||||||
|
}, "filename")
|
||||||
|
```
|
||||||
|
|
||||||
|
Holy crap!
|
||||||
|
|
||||||
|
Note that single quotes around values will be stripped:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
foo = "some value" // foo: some value
|
||||||
|
bar = 'some value' // bar: some value
|
||||||
|
```
|
||||||
|
|
||||||
|
That's all? Hmm, no.
|
||||||
|
|
||||||
|
#### Helper methods of working with values
|
||||||
|
|
||||||
|
To get value with given candidates:
|
||||||
|
|
||||||
|
```go
|
||||||
|
v = cfg.Section("").Key("STRING").In("default", []string{"str", "arr", "types"})
|
||||||
|
v = cfg.Section("").Key("FLOAT64").InFloat64(1.1, []float64{1.25, 2.5, 3.75})
|
||||||
|
v = cfg.Section("").Key("INT").InInt(5, []int{10, 20, 30})
|
||||||
|
v = cfg.Section("").Key("INT64").InInt64(10, []int64{10, 20, 30})
|
||||||
|
v = cfg.Section("").Key("UINT").InUint(4, []int{3, 6, 9})
|
||||||
|
v = cfg.Section("").Key("UINT64").InUint64(8, []int64{3, 6, 9})
|
||||||
|
v = cfg.Section("").Key("TIME").InTimeFormat(time.RFC3339, time.Now(), []time.Time{time1, time2, time3})
|
||||||
|
v = cfg.Section("").Key("TIME").InTime(time.Now(), []time.Time{time1, time2, time3}) // RFC3339
|
||||||
|
```
|
||||||
|
|
||||||
|
Default value will be presented if value of key is not in candidates you given, and default value does not need be one of candidates.
|
||||||
|
|
||||||
|
To validate value in a given range:
|
||||||
|
|
||||||
|
```go
|
||||||
|
vals = cfg.Section("").Key("FLOAT64").RangeFloat64(0.0, 1.1, 2.2)
|
||||||
|
vals = cfg.Section("").Key("INT").RangeInt(0, 10, 20)
|
||||||
|
vals = cfg.Section("").Key("INT64").RangeInt64(0, 10, 20)
|
||||||
|
vals = cfg.Section("").Key("UINT").RangeUint(0, 3, 9)
|
||||||
|
vals = cfg.Section("").Key("UINT64").RangeUint64(0, 3, 9)
|
||||||
|
vals = cfg.Section("").Key("TIME").RangeTimeFormat(time.RFC3339, time.Now(), minTime, maxTime)
|
||||||
|
vals = cfg.Section("").Key("TIME").RangeTime(time.Now(), minTime, maxTime) // RFC3339
|
||||||
|
```
|
||||||
|
|
||||||
|
##### Auto-split values into a slice
|
||||||
|
|
||||||
|
To use zero value of type for invalid inputs:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
|
||||||
|
// Input: how, 2.2, are, you -> [0.0 2.2 0.0 0.0]
|
||||||
|
vals = cfg.Section("").Key("STRINGS").Strings(",")
|
||||||
|
vals = cfg.Section("").Key("FLOAT64S").Float64s(",")
|
||||||
|
vals = cfg.Section("").Key("INTS").Ints(",")
|
||||||
|
vals = cfg.Section("").Key("INT64S").Int64s(",")
|
||||||
|
vals = cfg.Section("").Key("UINTS").Uints(",")
|
||||||
|
vals = cfg.Section("").Key("UINT64S").Uint64s(",")
|
||||||
|
vals = cfg.Section("").Key("TIMES").Times(",")
|
||||||
|
```
|
||||||
|
|
||||||
|
To exclude invalid values out of result slice:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
|
||||||
|
// Input: how, 2.2, are, you -> [2.2]
|
||||||
|
vals = cfg.Section("").Key("FLOAT64S").ValidFloat64s(",")
|
||||||
|
vals = cfg.Section("").Key("INTS").ValidInts(",")
|
||||||
|
vals = cfg.Section("").Key("INT64S").ValidInt64s(",")
|
||||||
|
vals = cfg.Section("").Key("UINTS").ValidUints(",")
|
||||||
|
vals = cfg.Section("").Key("UINT64S").ValidUint64s(",")
|
||||||
|
vals = cfg.Section("").Key("TIMES").ValidTimes(",")
|
||||||
|
```
|
||||||
|
|
||||||
|
Or to return nothing but error when have invalid inputs:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
|
||||||
|
// Input: how, 2.2, are, you -> error
|
||||||
|
vals = cfg.Section("").Key("FLOAT64S").StrictFloat64s(",")
|
||||||
|
vals = cfg.Section("").Key("INTS").StrictInts(",")
|
||||||
|
vals = cfg.Section("").Key("INT64S").StrictInt64s(",")
|
||||||
|
vals = cfg.Section("").Key("UINTS").StrictUints(",")
|
||||||
|
vals = cfg.Section("").Key("UINT64S").StrictUint64s(",")
|
||||||
|
vals = cfg.Section("").Key("TIMES").StrictTimes(",")
|
||||||
|
```
|
||||||
|
|
||||||
|
### Save your configuration
|
||||||
|
|
||||||
|
Finally, it's time to save your configuration to somewhere.
|
||||||
|
|
||||||
|
A typical way to save configuration is writing it to a file:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// ...
|
||||||
|
err = cfg.SaveTo("my.ini")
|
||||||
|
err = cfg.SaveToIndent("my.ini", "\t")
|
||||||
|
```
|
||||||
|
|
||||||
|
Another way to save is writing to a `io.Writer` interface:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// ...
|
||||||
|
cfg.WriteTo(writer)
|
||||||
|
cfg.WriteToIndent(writer, "\t")
|
||||||
|
```
|
||||||
|
|
||||||
|
By default, spaces are used to align "=" sign between key and values, to disable that:
|
||||||
|
|
||||||
|
```go
|
||||||
|
ini.PrettyFormat = false
|
||||||
|
```
|
||||||
|
|
||||||
|
## Advanced Usage
|
||||||
|
|
||||||
|
### Recursive Values
|
||||||
|
|
||||||
|
For all value of keys, there is a special syntax `%(<name>)s`, where `<name>` is the key name in same section or default section, and `%(<name>)s` will be replaced by corresponding value(empty string if key not found). You can use this syntax at most 99 level of recursions.
|
||||||
|
|
||||||
|
```ini
|
||||||
|
NAME = ini
|
||||||
|
|
||||||
|
[author]
|
||||||
|
NAME = Unknwon
|
||||||
|
GITHUB = https://github.com/%(NAME)s
|
||||||
|
|
||||||
|
[package]
|
||||||
|
FULL_NAME = github.com/go-ini/%(NAME)s
|
||||||
|
```
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("author").Key("GITHUB").String() // https://github.com/Unknwon
|
||||||
|
cfg.Section("package").Key("FULL_NAME").String() // github.com/go-ini/ini
|
||||||
|
```
|
||||||
|
|
||||||
|
### Parent-child Sections
|
||||||
|
|
||||||
|
You can use `.` in section name to indicate parent-child relationship between two or more sections. If the key not found in the child section, library will try again on its parent section until there is no parent section.
|
||||||
|
|
||||||
|
```ini
|
||||||
|
NAME = ini
|
||||||
|
VERSION = v1
|
||||||
|
IMPORT_PATH = gopkg.in/%(NAME)s.%(VERSION)s
|
||||||
|
|
||||||
|
[package]
|
||||||
|
CLONE_URL = https://%(IMPORT_PATH)s
|
||||||
|
|
||||||
|
[package.sub]
|
||||||
|
```
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("package.sub").Key("CLONE_URL").String() // https://gopkg.in/ini.v1
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Retrieve parent keys available to a child section
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("package.sub").ParentKeys() // ["CLONE_URL"]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Unparseable Sections
|
||||||
|
|
||||||
|
Sometimes, you have sections that do not contain key-value pairs but raw content, to handle such case, you can use `LoadOptions.UnparsableSections`:
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := LoadSources(LoadOptions{UnparseableSections: []string{"COMMENTS"}}, `[COMMENTS]
|
||||||
|
<1><L.Slide#2> This slide has the fuel listed in the wrong units <e.1>`))
|
||||||
|
|
||||||
|
body := cfg.Section("COMMENTS").Body()
|
||||||
|
|
||||||
|
/* --- start ---
|
||||||
|
<1><L.Slide#2> This slide has the fuel listed in the wrong units <e.1>
|
||||||
|
------ end --- */
|
||||||
|
```
|
||||||
|
|
||||||
|
### Auto-increment Key Names
|
||||||
|
|
||||||
|
If key name is `-` in data source, then it would be seen as special syntax for auto-increment key name start from 1, and every section is independent on counter.
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[features]
|
||||||
|
-: Support read/write comments of keys and sections
|
||||||
|
-: Support auto-increment of key names
|
||||||
|
-: Support load multiple files to overwrite key values
|
||||||
|
```
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("features").KeyStrings() // []{"#1", "#2", "#3"}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Map To Struct
|
||||||
|
|
||||||
|
Want more objective way to play with INI? Cool.
|
||||||
|
|
||||||
|
```ini
|
||||||
|
Name = Unknwon
|
||||||
|
age = 21
|
||||||
|
Male = true
|
||||||
|
Born = 1993-01-01T20:17:05Z
|
||||||
|
|
||||||
|
[Note]
|
||||||
|
Content = Hi is a good man!
|
||||||
|
Cities = HangZhou, Boston
|
||||||
|
```
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Note struct {
|
||||||
|
Content string
|
||||||
|
Cities []string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Person struct {
|
||||||
|
Name string
|
||||||
|
Age int `ini:"age"`
|
||||||
|
Male bool
|
||||||
|
Born time.Time
|
||||||
|
Note
|
||||||
|
Created time.Time `ini:"-"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
cfg, err := ini.Load("path/to/ini")
|
||||||
|
// ...
|
||||||
|
p := new(Person)
|
||||||
|
err = cfg.MapTo(p)
|
||||||
|
// ...
|
||||||
|
|
||||||
|
// Things can be simpler.
|
||||||
|
err = ini.MapTo(p, "path/to/ini")
|
||||||
|
// ...
|
||||||
|
|
||||||
|
// Just map a section? Fine.
|
||||||
|
n := new(Note)
|
||||||
|
err = cfg.Section("Note").MapTo(n)
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Can I have default value for field? Absolutely.
|
||||||
|
|
||||||
|
Assign it before you map to struct. It will keep the value as it is if the key is not presented or got wrong type.
|
||||||
|
|
||||||
|
```go
|
||||||
|
// ...
|
||||||
|
p := &Person{
|
||||||
|
Name: "Joe",
|
||||||
|
}
|
||||||
|
// ...
|
||||||
|
```
|
||||||
|
|
||||||
|
It's really cool, but what's the point if you can't give me my file back from struct?
|
||||||
|
|
||||||
|
### Reflect From Struct
|
||||||
|
|
||||||
|
Why not?
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Embeded struct {
|
||||||
|
Dates []time.Time `delim:"|"`
|
||||||
|
Places []string `ini:"places,omitempty"`
|
||||||
|
None []int `ini:",omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Author struct {
|
||||||
|
Name string `ini:"NAME"`
|
||||||
|
Male bool
|
||||||
|
Age int
|
||||||
|
GPA float64
|
||||||
|
NeverMind string `ini:"-"`
|
||||||
|
*Embeded
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
a := &Author{"Unknwon", true, 21, 2.8, "",
|
||||||
|
&Embeded{
|
||||||
|
[]time.Time{time.Now(), time.Now()},
|
||||||
|
[]string{"HangZhou", "Boston"},
|
||||||
|
[]int{},
|
||||||
|
}}
|
||||||
|
cfg := ini.Empty()
|
||||||
|
err = ini.ReflectFrom(cfg, a)
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
So, what do I get?
|
||||||
|
|
||||||
|
```ini
|
||||||
|
NAME = Unknwon
|
||||||
|
Male = true
|
||||||
|
Age = 21
|
||||||
|
GPA = 2.8
|
||||||
|
|
||||||
|
[Embeded]
|
||||||
|
Dates = 2015-08-07T22:14:22+08:00|2015-08-07T22:14:22+08:00
|
||||||
|
places = HangZhou,Boston
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Name Mapper
|
||||||
|
|
||||||
|
To save your time and make your code cleaner, this library supports [`NameMapper`](https://gowalker.org/gopkg.in/ini.v1#NameMapper) between struct field and actual section and key name.
|
||||||
|
|
||||||
|
There are 2 built-in name mappers:
|
||||||
|
|
||||||
|
- `AllCapsUnderscore`: it converts to format `ALL_CAPS_UNDERSCORE` then match section or key.
|
||||||
|
- `TitleUnderscore`: it converts to format `title_underscore` then match section or key.
|
||||||
|
|
||||||
|
To use them:
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Info struct {
|
||||||
|
PackageName string
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
err = ini.MapToWithMapper(&Info{}, ini.TitleUnderscore, []byte("package_name=ini"))
|
||||||
|
// ...
|
||||||
|
|
||||||
|
cfg, err := ini.Load([]byte("PACKAGE_NAME=ini"))
|
||||||
|
// ...
|
||||||
|
info := new(Info)
|
||||||
|
cfg.NameMapper = ini.AllCapsUnderscore
|
||||||
|
err = cfg.MapTo(info)
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Same rules of name mapper apply to `ini.ReflectFromWithMapper` function.
|
||||||
|
|
||||||
|
#### Value Mapper
|
||||||
|
|
||||||
|
To expand values (e.g. from environment variables), you can use the `ValueMapper` to transform values:
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Env struct {
|
||||||
|
Foo string `ini:"foo"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
cfg, err := ini.Load([]byte("[env]\nfoo = ${MY_VAR}\n")
|
||||||
|
cfg.ValueMapper = os.ExpandEnv
|
||||||
|
// ...
|
||||||
|
env := &Env{}
|
||||||
|
err = cfg.Section("env").MapTo(env)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
This would set the value of `env.Foo` to the value of the environment variable `MY_VAR`.
|
||||||
|
|
||||||
|
#### Other Notes On Map/Reflect
|
||||||
|
|
||||||
|
Any embedded struct is treated as a section by default, and there is no automatic parent-child relations in map/reflect feature:
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Child struct {
|
||||||
|
Age string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Parent struct {
|
||||||
|
Name string
|
||||||
|
Child
|
||||||
|
}
|
||||||
|
|
||||||
|
type Config struct {
|
||||||
|
City string
|
||||||
|
Parent
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Example configuration:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
City = Boston
|
||||||
|
|
||||||
|
[Parent]
|
||||||
|
Name = Unknwon
|
||||||
|
|
||||||
|
[Child]
|
||||||
|
Age = 21
|
||||||
|
```
|
||||||
|
|
||||||
|
What if, yes, I'm paranoid, I want embedded struct to be in the same section. Well, all roads lead to Rome.
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Child struct {
|
||||||
|
Age string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Parent struct {
|
||||||
|
Name string
|
||||||
|
Child `ini:"Parent"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Config struct {
|
||||||
|
City string
|
||||||
|
Parent
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Example configuration:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
City = Boston
|
||||||
|
|
||||||
|
[Parent]
|
||||||
|
Name = Unknwon
|
||||||
|
Age = 21
|
||||||
|
```
|
||||||
|
|
||||||
|
## Getting Help
|
||||||
|
|
||||||
|
- [API Documentation](https://gowalker.org/gopkg.in/ini.v1)
|
||||||
|
- [File An Issue](https://github.com/go-ini/ini/issues/new)
|
||||||
|
|
||||||
|
## FAQs
|
||||||
|
|
||||||
|
### What does `BlockMode` field do?
|
||||||
|
|
||||||
|
By default, library lets you read and write values so we need a locker to make sure your data is safe. But in cases that you are very sure about only reading data through the library, you can set `cfg.BlockMode = false` to speed up read operations about **50-70%** faster.
|
||||||
|
|
||||||
|
### Why another INI library?
|
||||||
|
|
||||||
|
Many people are using my another INI library [goconfig](https://github.com/Unknwon/goconfig), so the reason for this one is I would like to make more Go style code. Also when you set `cfg.BlockMode = false`, this one is about **10-30%** faster.
|
||||||
|
|
||||||
|
To make those changes I have to confirm API broken, so it's safer to keep it in another place and start using `gopkg.in` to version my package at this time.(PS: shorter import path)
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
This project is under Apache v2 License. See the [LICENSE](LICENSE) file for the full license text.
|
727
vendor/src/github.com/go-ini/ini/README_ZH.md
vendored
Normal file
727
vendor/src/github.com/go-ini/ini/README_ZH.md
vendored
Normal file
|
@ -0,0 +1,727 @@
|
||||||
|
本包提供了 Go 语言中读写 INI 文件的功能。
|
||||||
|
|
||||||
|
## 功能特性
|
||||||
|
|
||||||
|
- 支持覆盖加载多个数据源(`[]byte`、文件和 `io.ReadCloser`)
|
||||||
|
- 支持递归读取键值
|
||||||
|
- 支持读取父子分区
|
||||||
|
- 支持读取自增键名
|
||||||
|
- 支持读取多行的键值
|
||||||
|
- 支持大量辅助方法
|
||||||
|
- 支持在读取时直接转换为 Go 语言类型
|
||||||
|
- 支持读取和 **写入** 分区和键的注释
|
||||||
|
- 轻松操作分区、键值和注释
|
||||||
|
- 在保存文件时分区和键值会保持原有的顺序
|
||||||
|
|
||||||
|
## 下载安装
|
||||||
|
|
||||||
|
使用一个特定版本:
|
||||||
|
|
||||||
|
go get gopkg.in/ini.v1
|
||||||
|
|
||||||
|
使用最新版:
|
||||||
|
|
||||||
|
go get github.com/go-ini/ini
|
||||||
|
|
||||||
|
如需更新请添加 `-u` 选项。
|
||||||
|
|
||||||
|
### 测试安装
|
||||||
|
|
||||||
|
如果您想要在自己的机器上运行测试,请使用 `-t` 标记:
|
||||||
|
|
||||||
|
go get -t gopkg.in/ini.v1
|
||||||
|
|
||||||
|
如需更新请添加 `-u` 选项。
|
||||||
|
|
||||||
|
## 开始使用
|
||||||
|
|
||||||
|
### 从数据源加载
|
||||||
|
|
||||||
|
一个 **数据源** 可以是 `[]byte` 类型的原始数据,`string` 类型的文件路径或 `io.ReadCloser`。您可以加载 **任意多个** 数据源。如果您传递其它类型的数据源,则会直接返回错误。
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := ini.Load([]byte("raw data"), "filename", ioutil.NopCloser(bytes.NewReader([]byte("some other data"))))
|
||||||
|
```
|
||||||
|
|
||||||
|
或者从一个空白的文件开始:
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg := ini.Empty()
|
||||||
|
```
|
||||||
|
|
||||||
|
当您在一开始无法决定需要加载哪些数据源时,仍可以使用 **Append()** 在需要的时候加载它们。
|
||||||
|
|
||||||
|
```go
|
||||||
|
err := cfg.Append("other file", []byte("other raw data"))
|
||||||
|
```
|
||||||
|
|
||||||
|
当您想要加载一系列文件,但是不能够确定其中哪些文件是不存在的,可以通过调用函数 `LooseLoad` 来忽略它们(`Load` 会因为文件不存在而返回错误):
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := ini.LooseLoad("filename", "filename_404")
|
||||||
|
```
|
||||||
|
|
||||||
|
更牛逼的是,当那些之前不存在的文件在重新调用 `Reload` 方法的时候突然出现了,那么它们会被正常加载。
|
||||||
|
|
||||||
|
#### 忽略键名的大小写
|
||||||
|
|
||||||
|
有时候分区和键的名称大小写混合非常烦人,这个时候就可以通过 `InsensitiveLoad` 将所有分区和键名在读取里强制转换为小写:
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := ini.InsensitiveLoad("filename")
|
||||||
|
//...
|
||||||
|
|
||||||
|
// sec1 和 sec2 指向同一个分区对象
|
||||||
|
sec1, err := cfg.GetSection("Section")
|
||||||
|
sec2, err := cfg.GetSection("SecTIOn")
|
||||||
|
|
||||||
|
// key1 和 key2 指向同一个键对象
|
||||||
|
key1, err := cfg.GetKey("Key")
|
||||||
|
key2, err := cfg.GetKey("KeY")
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 类似 MySQL 配置中的布尔值键
|
||||||
|
|
||||||
|
MySQL 的配置文件中会出现没有具体值的布尔类型的键:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[mysqld]
|
||||||
|
...
|
||||||
|
skip-host-cache
|
||||||
|
skip-name-resolve
|
||||||
|
```
|
||||||
|
|
||||||
|
默认情况下这被认为是缺失值而无法完成解析,但可以通过高级的加载选项对它们进行处理:
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := LoadSources(LoadOptions{AllowBooleanKeys: true}, "my.cnf"))
|
||||||
|
```
|
||||||
|
|
||||||
|
这些键的值永远为 `true`,且在保存到文件时也只会输出键名。
|
||||||
|
|
||||||
|
如果您想要通过程序来生成此类键,则可以使用 `NewBooleanKey`:
|
||||||
|
|
||||||
|
```go
|
||||||
|
key, err := sec.NewBooleanKey("skip-host-cache")
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 关于注释
|
||||||
|
|
||||||
|
下述几种情况的内容将被视为注释:
|
||||||
|
|
||||||
|
1. 所有以 `#` 或 `;` 开头的行
|
||||||
|
2. 所有在 `#` 或 `;` 之后的内容
|
||||||
|
3. 分区标签后的文字 (即 `[分区名]` 之后的内容)
|
||||||
|
|
||||||
|
如果你希望使用包含 `#` 或 `;` 的值,请使用 ``` ` ``` 或 ``` """ ``` 进行包覆。
|
||||||
|
|
||||||
|
### 操作分区(Section)
|
||||||
|
|
||||||
|
获取指定分区:
|
||||||
|
|
||||||
|
```go
|
||||||
|
section, err := cfg.GetSection("section name")
|
||||||
|
```
|
||||||
|
|
||||||
|
如果您想要获取默认分区,则可以用空字符串代替分区名:
|
||||||
|
|
||||||
|
```go
|
||||||
|
section, err := cfg.GetSection("")
|
||||||
|
```
|
||||||
|
|
||||||
|
当您非常确定某个分区是存在的,可以使用以下简便方法:
|
||||||
|
|
||||||
|
```go
|
||||||
|
section := cfg.Section("section name")
|
||||||
|
```
|
||||||
|
|
||||||
|
如果不小心判断错了,要获取的分区其实是不存在的,那会发生什么呢?没事的,它会自动创建并返回一个对应的分区对象给您。
|
||||||
|
|
||||||
|
创建一个分区:
|
||||||
|
|
||||||
|
```go
|
||||||
|
err := cfg.NewSection("new section")
|
||||||
|
```
|
||||||
|
|
||||||
|
获取所有分区对象或名称:
|
||||||
|
|
||||||
|
```go
|
||||||
|
sections := cfg.Sections()
|
||||||
|
names := cfg.SectionStrings()
|
||||||
|
```
|
||||||
|
|
||||||
|
### 操作键(Key)
|
||||||
|
|
||||||
|
获取某个分区下的键:
|
||||||
|
|
||||||
|
```go
|
||||||
|
key, err := cfg.Section("").GetKey("key name")
|
||||||
|
```
|
||||||
|
|
||||||
|
和分区一样,您也可以直接获取键而忽略错误处理:
|
||||||
|
|
||||||
|
```go
|
||||||
|
key := cfg.Section("").Key("key name")
|
||||||
|
```
|
||||||
|
|
||||||
|
判断某个键是否存在:
|
||||||
|
|
||||||
|
```go
|
||||||
|
yes := cfg.Section("").HasKey("key name")
|
||||||
|
```
|
||||||
|
|
||||||
|
创建一个新的键:
|
||||||
|
|
||||||
|
```go
|
||||||
|
err := cfg.Section("").NewKey("name", "value")
|
||||||
|
```
|
||||||
|
|
||||||
|
获取分区下的所有键或键名:
|
||||||
|
|
||||||
|
```go
|
||||||
|
keys := cfg.Section("").Keys()
|
||||||
|
names := cfg.Section("").KeyStrings()
|
||||||
|
```
|
||||||
|
|
||||||
|
获取分区下的所有键值对的克隆:
|
||||||
|
|
||||||
|
```go
|
||||||
|
hash := cfg.Section("").KeysHash()
|
||||||
|
```
|
||||||
|
|
||||||
|
### 操作键值(Value)
|
||||||
|
|
||||||
|
获取一个类型为字符串(string)的值:
|
||||||
|
|
||||||
|
```go
|
||||||
|
val := cfg.Section("").Key("key name").String()
|
||||||
|
```
|
||||||
|
|
||||||
|
获取值的同时通过自定义函数进行处理验证:
|
||||||
|
|
||||||
|
```go
|
||||||
|
val := cfg.Section("").Key("key name").Validate(func(in string) string {
|
||||||
|
if len(in) == 0 {
|
||||||
|
return "default"
|
||||||
|
}
|
||||||
|
return in
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
如果您不需要任何对值的自动转变功能(例如递归读取),可以直接获取原值(这种方式性能最佳):
|
||||||
|
|
||||||
|
```go
|
||||||
|
val := cfg.Section("").Key("key name").Value()
|
||||||
|
```
|
||||||
|
|
||||||
|
判断某个原值是否存在:
|
||||||
|
|
||||||
|
```go
|
||||||
|
yes := cfg.Section("").HasValue("test value")
|
||||||
|
```
|
||||||
|
|
||||||
|
获取其它类型的值:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// 布尔值的规则:
|
||||||
|
// true 当值为:1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On
|
||||||
|
// false 当值为:0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off
|
||||||
|
v, err = cfg.Section("").Key("BOOL").Bool()
|
||||||
|
v, err = cfg.Section("").Key("FLOAT64").Float64()
|
||||||
|
v, err = cfg.Section("").Key("INT").Int()
|
||||||
|
v, err = cfg.Section("").Key("INT64").Int64()
|
||||||
|
v, err = cfg.Section("").Key("UINT").Uint()
|
||||||
|
v, err = cfg.Section("").Key("UINT64").Uint64()
|
||||||
|
v, err = cfg.Section("").Key("TIME").TimeFormat(time.RFC3339)
|
||||||
|
v, err = cfg.Section("").Key("TIME").Time() // RFC3339
|
||||||
|
|
||||||
|
v = cfg.Section("").Key("BOOL").MustBool()
|
||||||
|
v = cfg.Section("").Key("FLOAT64").MustFloat64()
|
||||||
|
v = cfg.Section("").Key("INT").MustInt()
|
||||||
|
v = cfg.Section("").Key("INT64").MustInt64()
|
||||||
|
v = cfg.Section("").Key("UINT").MustUint()
|
||||||
|
v = cfg.Section("").Key("UINT64").MustUint64()
|
||||||
|
v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339)
|
||||||
|
v = cfg.Section("").Key("TIME").MustTime() // RFC3339
|
||||||
|
|
||||||
|
// 由 Must 开头的方法名允许接收一个相同类型的参数来作为默认值,
|
||||||
|
// 当键不存在或者转换失败时,则会直接返回该默认值。
|
||||||
|
// 但是,MustString 方法必须传递一个默认值。
|
||||||
|
|
||||||
|
v = cfg.Seciont("").Key("String").MustString("default")
|
||||||
|
v = cfg.Section("").Key("BOOL").MustBool(true)
|
||||||
|
v = cfg.Section("").Key("FLOAT64").MustFloat64(1.25)
|
||||||
|
v = cfg.Section("").Key("INT").MustInt(10)
|
||||||
|
v = cfg.Section("").Key("INT64").MustInt64(99)
|
||||||
|
v = cfg.Section("").Key("UINT").MustUint(3)
|
||||||
|
v = cfg.Section("").Key("UINT64").MustUint64(6)
|
||||||
|
v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339, time.Now())
|
||||||
|
v = cfg.Section("").Key("TIME").MustTime(time.Now()) // RFC3339
|
||||||
|
```
|
||||||
|
|
||||||
|
如果我的值有好多行怎么办?
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[advance]
|
||||||
|
ADDRESS = """404 road,
|
||||||
|
NotFound, State, 5000
|
||||||
|
Earth"""
|
||||||
|
```
|
||||||
|
|
||||||
|
嗯哼?小 case!
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("advance").Key("ADDRESS").String()
|
||||||
|
|
||||||
|
/* --- start ---
|
||||||
|
404 road,
|
||||||
|
NotFound, State, 5000
|
||||||
|
Earth
|
||||||
|
------ end --- */
|
||||||
|
```
|
||||||
|
|
||||||
|
赞爆了!那要是我属于一行的内容写不下想要写到第二行怎么办?
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[advance]
|
||||||
|
two_lines = how about \
|
||||||
|
continuation lines?
|
||||||
|
lots_of_lines = 1 \
|
||||||
|
2 \
|
||||||
|
3 \
|
||||||
|
4
|
||||||
|
```
|
||||||
|
|
||||||
|
简直是小菜一碟!
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("advance").Key("two_lines").String() // how about continuation lines?
|
||||||
|
cfg.Section("advance").Key("lots_of_lines").String() // 1 2 3 4
|
||||||
|
```
|
||||||
|
|
||||||
|
可是我有时候觉得两行连在一起特别没劲,怎么才能不自动连接两行呢?
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := ini.LoadSources(ini.LoadOptions{
|
||||||
|
IgnoreContinuation: true,
|
||||||
|
}, "filename")
|
||||||
|
```
|
||||||
|
|
||||||
|
哇靠给力啊!
|
||||||
|
|
||||||
|
需要注意的是,值两侧的单引号会被自动剔除:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
foo = "some value" // foo: some value
|
||||||
|
bar = 'some value' // bar: some value
|
||||||
|
```
|
||||||
|
|
||||||
|
这就是全部了?哈哈,当然不是。
|
||||||
|
|
||||||
|
#### 操作键值的辅助方法
|
||||||
|
|
||||||
|
获取键值时设定候选值:
|
||||||
|
|
||||||
|
```go
|
||||||
|
v = cfg.Section("").Key("STRING").In("default", []string{"str", "arr", "types"})
|
||||||
|
v = cfg.Section("").Key("FLOAT64").InFloat64(1.1, []float64{1.25, 2.5, 3.75})
|
||||||
|
v = cfg.Section("").Key("INT").InInt(5, []int{10, 20, 30})
|
||||||
|
v = cfg.Section("").Key("INT64").InInt64(10, []int64{10, 20, 30})
|
||||||
|
v = cfg.Section("").Key("UINT").InUint(4, []int{3, 6, 9})
|
||||||
|
v = cfg.Section("").Key("UINT64").InUint64(8, []int64{3, 6, 9})
|
||||||
|
v = cfg.Section("").Key("TIME").InTimeFormat(time.RFC3339, time.Now(), []time.Time{time1, time2, time3})
|
||||||
|
v = cfg.Section("").Key("TIME").InTime(time.Now(), []time.Time{time1, time2, time3}) // RFC3339
|
||||||
|
```
|
||||||
|
|
||||||
|
如果获取到的值不是候选值的任意一个,则会返回默认值,而默认值不需要是候选值中的一员。
|
||||||
|
|
||||||
|
验证获取的值是否在指定范围内:
|
||||||
|
|
||||||
|
```go
|
||||||
|
vals = cfg.Section("").Key("FLOAT64").RangeFloat64(0.0, 1.1, 2.2)
|
||||||
|
vals = cfg.Section("").Key("INT").RangeInt(0, 10, 20)
|
||||||
|
vals = cfg.Section("").Key("INT64").RangeInt64(0, 10, 20)
|
||||||
|
vals = cfg.Section("").Key("UINT").RangeUint(0, 3, 9)
|
||||||
|
vals = cfg.Section("").Key("UINT64").RangeUint64(0, 3, 9)
|
||||||
|
vals = cfg.Section("").Key("TIME").RangeTimeFormat(time.RFC3339, time.Now(), minTime, maxTime)
|
||||||
|
vals = cfg.Section("").Key("TIME").RangeTime(time.Now(), minTime, maxTime) // RFC3339
|
||||||
|
```
|
||||||
|
|
||||||
|
##### 自动分割键值到切片(slice)
|
||||||
|
|
||||||
|
当存在无效输入时,使用零值代替:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
|
||||||
|
// Input: how, 2.2, are, you -> [0.0 2.2 0.0 0.0]
|
||||||
|
vals = cfg.Section("").Key("STRINGS").Strings(",")
|
||||||
|
vals = cfg.Section("").Key("FLOAT64S").Float64s(",")
|
||||||
|
vals = cfg.Section("").Key("INTS").Ints(",")
|
||||||
|
vals = cfg.Section("").Key("INT64S").Int64s(",")
|
||||||
|
vals = cfg.Section("").Key("UINTS").Uints(",")
|
||||||
|
vals = cfg.Section("").Key("UINT64S").Uint64s(",")
|
||||||
|
vals = cfg.Section("").Key("TIMES").Times(",")
|
||||||
|
```
|
||||||
|
|
||||||
|
从结果切片中剔除无效输入:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
|
||||||
|
// Input: how, 2.2, are, you -> [2.2]
|
||||||
|
vals = cfg.Section("").Key("FLOAT64S").ValidFloat64s(",")
|
||||||
|
vals = cfg.Section("").Key("INTS").ValidInts(",")
|
||||||
|
vals = cfg.Section("").Key("INT64S").ValidInt64s(",")
|
||||||
|
vals = cfg.Section("").Key("UINTS").ValidUints(",")
|
||||||
|
vals = cfg.Section("").Key("UINT64S").ValidUint64s(",")
|
||||||
|
vals = cfg.Section("").Key("TIMES").ValidTimes(",")
|
||||||
|
```
|
||||||
|
|
||||||
|
当存在无效输入时,直接返回错误:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
|
||||||
|
// Input: how, 2.2, are, you -> error
|
||||||
|
vals = cfg.Section("").Key("FLOAT64S").StrictFloat64s(",")
|
||||||
|
vals = cfg.Section("").Key("INTS").StrictInts(",")
|
||||||
|
vals = cfg.Section("").Key("INT64S").StrictInt64s(",")
|
||||||
|
vals = cfg.Section("").Key("UINTS").StrictUints(",")
|
||||||
|
vals = cfg.Section("").Key("UINT64S").StrictUint64s(",")
|
||||||
|
vals = cfg.Section("").Key("TIMES").StrictTimes(",")
|
||||||
|
```
|
||||||
|
|
||||||
|
### 保存配置
|
||||||
|
|
||||||
|
终于到了这个时刻,是时候保存一下配置了。
|
||||||
|
|
||||||
|
比较原始的做法是输出配置到某个文件:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// ...
|
||||||
|
err = cfg.SaveTo("my.ini")
|
||||||
|
err = cfg.SaveToIndent("my.ini", "\t")
|
||||||
|
```
|
||||||
|
|
||||||
|
另一个比较高级的做法是写入到任何实现 `io.Writer` 接口的对象中:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// ...
|
||||||
|
cfg.WriteTo(writer)
|
||||||
|
cfg.WriteToIndent(writer, "\t")
|
||||||
|
```
|
||||||
|
|
||||||
|
默认情况下,空格将被用于对齐键值之间的等号以美化输出结果,以下代码可以禁用该功能:
|
||||||
|
|
||||||
|
```go
|
||||||
|
ini.PrettyFormat = false
|
||||||
|
```
|
||||||
|
|
||||||
|
## 高级用法
|
||||||
|
|
||||||
|
### 递归读取键值
|
||||||
|
|
||||||
|
在获取所有键值的过程中,特殊语法 `%(<name>)s` 会被应用,其中 `<name>` 可以是相同分区或者默认分区下的键名。字符串 `%(<name>)s` 会被相应的键值所替代,如果指定的键不存在,则会用空字符串替代。您可以最多使用 99 层的递归嵌套。
|
||||||
|
|
||||||
|
```ini
|
||||||
|
NAME = ini
|
||||||
|
|
||||||
|
[author]
|
||||||
|
NAME = Unknwon
|
||||||
|
GITHUB = https://github.com/%(NAME)s
|
||||||
|
|
||||||
|
[package]
|
||||||
|
FULL_NAME = github.com/go-ini/%(NAME)s
|
||||||
|
```
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("author").Key("GITHUB").String() // https://github.com/Unknwon
|
||||||
|
cfg.Section("package").Key("FULL_NAME").String() // github.com/go-ini/ini
|
||||||
|
```
|
||||||
|
|
||||||
|
### 读取父子分区
|
||||||
|
|
||||||
|
您可以在分区名称中使用 `.` 来表示两个或多个分区之间的父子关系。如果某个键在子分区中不存在,则会去它的父分区中再次寻找,直到没有父分区为止。
|
||||||
|
|
||||||
|
```ini
|
||||||
|
NAME = ini
|
||||||
|
VERSION = v1
|
||||||
|
IMPORT_PATH = gopkg.in/%(NAME)s.%(VERSION)s
|
||||||
|
|
||||||
|
[package]
|
||||||
|
CLONE_URL = https://%(IMPORT_PATH)s
|
||||||
|
|
||||||
|
[package.sub]
|
||||||
|
```
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("package.sub").Key("CLONE_URL").String() // https://gopkg.in/ini.v1
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 获取上级父分区下的所有键名
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("package.sub").ParentKeys() // ["CLONE_URL"]
|
||||||
|
```
|
||||||
|
|
||||||
|
### 无法解析的分区
|
||||||
|
|
||||||
|
如果遇到一些比较特殊的分区,它们不包含常见的键值对,而是没有固定格式的纯文本,则可以使用 `LoadOptions.UnparsableSections` 进行处理:
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg, err := LoadSources(LoadOptions{UnparseableSections: []string{"COMMENTS"}}, `[COMMENTS]
|
||||||
|
<1><L.Slide#2> This slide has the fuel listed in the wrong units <e.1>`))
|
||||||
|
|
||||||
|
body := cfg.Section("COMMENTS").Body()
|
||||||
|
|
||||||
|
/* --- start ---
|
||||||
|
<1><L.Slide#2> This slide has the fuel listed in the wrong units <e.1>
|
||||||
|
------ end --- */
|
||||||
|
```
|
||||||
|
|
||||||
|
### 读取自增键名
|
||||||
|
|
||||||
|
如果数据源中的键名为 `-`,则认为该键使用了自增键名的特殊语法。计数器从 1 开始,并且分区之间是相互独立的。
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[features]
|
||||||
|
-: Support read/write comments of keys and sections
|
||||||
|
-: Support auto-increment of key names
|
||||||
|
-: Support load multiple files to overwrite key values
|
||||||
|
```
|
||||||
|
|
||||||
|
```go
|
||||||
|
cfg.Section("features").KeyStrings() // []{"#1", "#2", "#3"}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 映射到结构
|
||||||
|
|
||||||
|
想要使用更加面向对象的方式玩转 INI 吗?好主意。
|
||||||
|
|
||||||
|
```ini
|
||||||
|
Name = Unknwon
|
||||||
|
age = 21
|
||||||
|
Male = true
|
||||||
|
Born = 1993-01-01T20:17:05Z
|
||||||
|
|
||||||
|
[Note]
|
||||||
|
Content = Hi is a good man!
|
||||||
|
Cities = HangZhou, Boston
|
||||||
|
```
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Note struct {
|
||||||
|
Content string
|
||||||
|
Cities []string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Person struct {
|
||||||
|
Name string
|
||||||
|
Age int `ini:"age"`
|
||||||
|
Male bool
|
||||||
|
Born time.Time
|
||||||
|
Note
|
||||||
|
Created time.Time `ini:"-"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
cfg, err := ini.Load("path/to/ini")
|
||||||
|
// ...
|
||||||
|
p := new(Person)
|
||||||
|
err = cfg.MapTo(p)
|
||||||
|
// ...
|
||||||
|
|
||||||
|
// 一切竟可以如此的简单。
|
||||||
|
err = ini.MapTo(p, "path/to/ini")
|
||||||
|
// ...
|
||||||
|
|
||||||
|
// 嗯哼?只需要映射一个分区吗?
|
||||||
|
n := new(Note)
|
||||||
|
err = cfg.Section("Note").MapTo(n)
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
结构的字段怎么设置默认值呢?很简单,只要在映射之前对指定字段进行赋值就可以了。如果键未找到或者类型错误,该值不会发生改变。
|
||||||
|
|
||||||
|
```go
|
||||||
|
// ...
|
||||||
|
p := &Person{
|
||||||
|
Name: "Joe",
|
||||||
|
}
|
||||||
|
// ...
|
||||||
|
```
|
||||||
|
|
||||||
|
这样玩 INI 真的好酷啊!然而,如果不能还给我原来的配置文件,有什么卵用?
|
||||||
|
|
||||||
|
### 从结构反射
|
||||||
|
|
||||||
|
可是,我有说不能吗?
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Embeded struct {
|
||||||
|
Dates []time.Time `delim:"|"`
|
||||||
|
Places []string `ini:"places,omitempty"`
|
||||||
|
None []int `ini:",omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Author struct {
|
||||||
|
Name string `ini:"NAME"`
|
||||||
|
Male bool
|
||||||
|
Age int
|
||||||
|
GPA float64
|
||||||
|
NeverMind string `ini:"-"`
|
||||||
|
*Embeded
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
a := &Author{"Unknwon", true, 21, 2.8, "",
|
||||||
|
&Embeded{
|
||||||
|
[]time.Time{time.Now(), time.Now()},
|
||||||
|
[]string{"HangZhou", "Boston"},
|
||||||
|
[]int{},
|
||||||
|
}}
|
||||||
|
cfg := ini.Empty()
|
||||||
|
err = ini.ReflectFrom(cfg, a)
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
瞧瞧,奇迹发生了。
|
||||||
|
|
||||||
|
```ini
|
||||||
|
NAME = Unknwon
|
||||||
|
Male = true
|
||||||
|
Age = 21
|
||||||
|
GPA = 2.8
|
||||||
|
|
||||||
|
[Embeded]
|
||||||
|
Dates = 2015-08-07T22:14:22+08:00|2015-08-07T22:14:22+08:00
|
||||||
|
places = HangZhou,Boston
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 名称映射器(Name Mapper)
|
||||||
|
|
||||||
|
为了节省您的时间并简化代码,本库支持类型为 [`NameMapper`](https://gowalker.org/gopkg.in/ini.v1#NameMapper) 的名称映射器,该映射器负责结构字段名与分区名和键名之间的映射。
|
||||||
|
|
||||||
|
目前有 2 款内置的映射器:
|
||||||
|
|
||||||
|
- `AllCapsUnderscore`:该映射器将字段名转换至格式 `ALL_CAPS_UNDERSCORE` 后再去匹配分区名和键名。
|
||||||
|
- `TitleUnderscore`:该映射器将字段名转换至格式 `title_underscore` 后再去匹配分区名和键名。
|
||||||
|
|
||||||
|
使用方法:
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Info struct{
|
||||||
|
PackageName string
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
err = ini.MapToWithMapper(&Info{}, ini.TitleUnderscore, []byte("package_name=ini"))
|
||||||
|
// ...
|
||||||
|
|
||||||
|
cfg, err := ini.Load([]byte("PACKAGE_NAME=ini"))
|
||||||
|
// ...
|
||||||
|
info := new(Info)
|
||||||
|
cfg.NameMapper = ini.AllCapsUnderscore
|
||||||
|
err = cfg.MapTo(info)
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
使用函数 `ini.ReflectFromWithMapper` 时也可应用相同的规则。
|
||||||
|
|
||||||
|
#### 值映射器(Value Mapper)
|
||||||
|
|
||||||
|
值映射器允许使用一个自定义函数自动展开值的具体内容,例如:运行时获取环境变量:
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Env struct {
|
||||||
|
Foo string `ini:"foo"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
cfg, err := ini.Load([]byte("[env]\nfoo = ${MY_VAR}\n")
|
||||||
|
cfg.ValueMapper = os.ExpandEnv
|
||||||
|
// ...
|
||||||
|
env := &Env{}
|
||||||
|
err = cfg.Section("env").MapTo(env)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
本例中,`env.Foo` 将会是运行时所获取到环境变量 `MY_VAR` 的值。
|
||||||
|
|
||||||
|
#### 映射/反射的其它说明
|
||||||
|
|
||||||
|
任何嵌入的结构都会被默认认作一个不同的分区,并且不会自动产生所谓的父子分区关联:
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Child struct {
|
||||||
|
Age string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Parent struct {
|
||||||
|
Name string
|
||||||
|
Child
|
||||||
|
}
|
||||||
|
|
||||||
|
type Config struct {
|
||||||
|
City string
|
||||||
|
Parent
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
示例配置文件:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
City = Boston
|
||||||
|
|
||||||
|
[Parent]
|
||||||
|
Name = Unknwon
|
||||||
|
|
||||||
|
[Child]
|
||||||
|
Age = 21
|
||||||
|
```
|
||||||
|
|
||||||
|
很好,但是,我就是要嵌入结构也在同一个分区。好吧,你爹是李刚!
|
||||||
|
|
||||||
|
```go
|
||||||
|
type Child struct {
|
||||||
|
Age string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Parent struct {
|
||||||
|
Name string
|
||||||
|
Child `ini:"Parent"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Config struct {
|
||||||
|
City string
|
||||||
|
Parent
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
示例配置文件:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
City = Boston
|
||||||
|
|
||||||
|
[Parent]
|
||||||
|
Name = Unknwon
|
||||||
|
Age = 21
|
||||||
|
```
|
||||||
|
|
||||||
|
## 获取帮助
|
||||||
|
|
||||||
|
- [API 文档](https://gowalker.org/gopkg.in/ini.v1)
|
||||||
|
- [创建工单](https://github.com/go-ini/ini/issues/new)
|
||||||
|
|
||||||
|
## 常见问题
|
||||||
|
|
||||||
|
### 字段 `BlockMode` 是什么?
|
||||||
|
|
||||||
|
默认情况下,本库会在您进行读写操作时采用锁机制来确保数据时间。但在某些情况下,您非常确定只进行读操作。此时,您可以通过设置 `cfg.BlockMode = false` 来将读操作提升大约 **50-70%** 的性能。
|
||||||
|
|
||||||
|
### 为什么要写另一个 INI 解析库?
|
||||||
|
|
||||||
|
许多人都在使用我的 [goconfig](https://github.com/Unknwon/goconfig) 来完成对 INI 文件的操作,但我希望使用更加 Go 风格的代码。并且当您设置 `cfg.BlockMode = false` 时,会有大约 **10-30%** 的性能提升。
|
||||||
|
|
||||||
|
为了做出这些改变,我必须对 API 进行破坏,所以新开一个仓库是最安全的做法。除此之外,本库直接使用 `gopkg.in` 来进行版本化发布。(其实真相是导入路径更短了)
|
32
vendor/src/github.com/go-ini/ini/error.go
vendored
Normal file
32
vendor/src/github.com/go-ini/ini/error.go
vendored
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
// Copyright 2016 Unknwon
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||||
|
// not use this file except in compliance with the License. You may obtain
|
||||||
|
// a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
// License for the specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
package ini
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ErrDelimiterNotFound struct {
|
||||||
|
Line string
|
||||||
|
}
|
||||||
|
|
||||||
|
func IsErrDelimiterNotFound(err error) bool {
|
||||||
|
_, ok := err.(ErrDelimiterNotFound)
|
||||||
|
return ok
|
||||||
|
}
|
||||||
|
|
||||||
|
func (err ErrDelimiterNotFound) Error() string {
|
||||||
|
return fmt.Sprintf("key-value delimiter not found: %s", err.Line)
|
||||||
|
}
|
556
vendor/src/github.com/go-ini/ini/ini.go
vendored
Normal file
556
vendor/src/github.com/go-ini/ini/ini.go
vendored
Normal file
|
@ -0,0 +1,556 @@
|
||||||
|
// Copyright 2014 Unknwon
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||||
|
// not use this file except in compliance with the License. You may obtain
|
||||||
|
// a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
// License for the specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
// Package ini provides INI file read and write functionality in Go.
|
||||||
|
package ini
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"io/ioutil"
|
||||||
|
"os"
|
||||||
|
"regexp"
|
||||||
|
"runtime"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// Name for default section. You can use this constant or the string literal.
|
||||||
|
// In most of cases, an empty string is all you need to access the section.
|
||||||
|
DEFAULT_SECTION = "DEFAULT"
|
||||||
|
|
||||||
|
// Maximum allowed depth when recursively substituing variable names.
|
||||||
|
_DEPTH_VALUES = 99
|
||||||
|
_VERSION = "1.27.0"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Version returns current package version literal.
|
||||||
|
func Version() string {
|
||||||
|
return _VERSION
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
// Delimiter to determine or compose a new line.
|
||||||
|
// This variable will be changed to "\r\n" automatically on Windows
|
||||||
|
// at package init time.
|
||||||
|
LineBreak = "\n"
|
||||||
|
|
||||||
|
// Variable regexp pattern: %(variable)s
|
||||||
|
varPattern = regexp.MustCompile(`%\(([^\)]+)\)s`)
|
||||||
|
|
||||||
|
// Indicate whether to align "=" sign with spaces to produce pretty output
|
||||||
|
// or reduce all possible spaces for compact format.
|
||||||
|
PrettyFormat = true
|
||||||
|
|
||||||
|
// Explicitly write DEFAULT section header
|
||||||
|
DefaultHeader = false
|
||||||
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
LineBreak = "\r\n"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func inSlice(str string, s []string) bool {
|
||||||
|
for _, v := range s {
|
||||||
|
if str == v {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// dataSource is an interface that returns object which can be read and closed.
|
||||||
|
type dataSource interface {
|
||||||
|
ReadCloser() (io.ReadCloser, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// sourceFile represents an object that contains content on the local file system.
|
||||||
|
type sourceFile struct {
|
||||||
|
name string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s sourceFile) ReadCloser() (_ io.ReadCloser, err error) {
|
||||||
|
return os.Open(s.name)
|
||||||
|
}
|
||||||
|
|
||||||
|
type bytesReadCloser struct {
|
||||||
|
reader io.Reader
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rc *bytesReadCloser) Read(p []byte) (n int, err error) {
|
||||||
|
return rc.reader.Read(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rc *bytesReadCloser) Close() error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// sourceData represents an object that contains content in memory.
|
||||||
|
type sourceData struct {
|
||||||
|
data []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *sourceData) ReadCloser() (io.ReadCloser, error) {
|
||||||
|
return ioutil.NopCloser(bytes.NewReader(s.data)), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// sourceReadCloser represents an input stream with Close method.
|
||||||
|
type sourceReadCloser struct {
|
||||||
|
reader io.ReadCloser
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *sourceReadCloser) ReadCloser() (io.ReadCloser, error) {
|
||||||
|
return s.reader, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// File represents a combination of a or more INI file(s) in memory.
|
||||||
|
type File struct {
|
||||||
|
// Should make things safe, but sometimes doesn't matter.
|
||||||
|
BlockMode bool
|
||||||
|
// Make sure data is safe in multiple goroutines.
|
||||||
|
lock sync.RWMutex
|
||||||
|
|
||||||
|
// Allow combination of multiple data sources.
|
||||||
|
dataSources []dataSource
|
||||||
|
// Actual data is stored here.
|
||||||
|
sections map[string]*Section
|
||||||
|
|
||||||
|
// To keep data in order.
|
||||||
|
sectionList []string
|
||||||
|
|
||||||
|
options LoadOptions
|
||||||
|
|
||||||
|
NameMapper
|
||||||
|
ValueMapper
|
||||||
|
}
|
||||||
|
|
||||||
|
// newFile initializes File object with given data sources.
|
||||||
|
func newFile(dataSources []dataSource, opts LoadOptions) *File {
|
||||||
|
return &File{
|
||||||
|
BlockMode: true,
|
||||||
|
dataSources: dataSources,
|
||||||
|
sections: make(map[string]*Section),
|
||||||
|
sectionList: make([]string, 0, 10),
|
||||||
|
options: opts,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseDataSource(source interface{}) (dataSource, error) {
|
||||||
|
switch s := source.(type) {
|
||||||
|
case string:
|
||||||
|
return sourceFile{s}, nil
|
||||||
|
case []byte:
|
||||||
|
return &sourceData{s}, nil
|
||||||
|
case io.ReadCloser:
|
||||||
|
return &sourceReadCloser{s}, nil
|
||||||
|
default:
|
||||||
|
return nil, fmt.Errorf("error parsing data source: unknown type '%s'", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type LoadOptions struct {
|
||||||
|
// Loose indicates whether the parser should ignore nonexistent files or return error.
|
||||||
|
Loose bool
|
||||||
|
// Insensitive indicates whether the parser forces all section and key names to lowercase.
|
||||||
|
Insensitive bool
|
||||||
|
// IgnoreContinuation indicates whether to ignore continuation lines while parsing.
|
||||||
|
IgnoreContinuation bool
|
||||||
|
// IgnoreInlineComment indicates whether to ignore comments at the end of value and treat it as part of value.
|
||||||
|
IgnoreInlineComment bool
|
||||||
|
// AllowBooleanKeys indicates whether to allow boolean type keys or treat as value is missing.
|
||||||
|
// This type of keys are mostly used in my.cnf.
|
||||||
|
AllowBooleanKeys bool
|
||||||
|
// AllowShadows indicates whether to keep track of keys with same name under same section.
|
||||||
|
AllowShadows bool
|
||||||
|
// Some INI formats allow group blocks that store a block of raw content that doesn't otherwise
|
||||||
|
// conform to key/value pairs. Specify the names of those blocks here.
|
||||||
|
UnparseableSections []string
|
||||||
|
}
|
||||||
|
|
||||||
|
func LoadSources(opts LoadOptions, source interface{}, others ...interface{}) (_ *File, err error) {
|
||||||
|
sources := make([]dataSource, len(others)+1)
|
||||||
|
sources[0], err = parseDataSource(source)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for i := range others {
|
||||||
|
sources[i+1], err = parseDataSource(others[i])
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
f := newFile(sources, opts)
|
||||||
|
if err = f.Reload(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return f, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load loads and parses from INI data sources.
|
||||||
|
// Arguments can be mixed of file name with string type, or raw data in []byte.
|
||||||
|
// It will return error if list contains nonexistent files.
|
||||||
|
func Load(source interface{}, others ...interface{}) (*File, error) {
|
||||||
|
return LoadSources(LoadOptions{}, source, others...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// LooseLoad has exactly same functionality as Load function
|
||||||
|
// except it ignores nonexistent files instead of returning error.
|
||||||
|
func LooseLoad(source interface{}, others ...interface{}) (*File, error) {
|
||||||
|
return LoadSources(LoadOptions{Loose: true}, source, others...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// InsensitiveLoad has exactly same functionality as Load function
|
||||||
|
// except it forces all section and key names to be lowercased.
|
||||||
|
func InsensitiveLoad(source interface{}, others ...interface{}) (*File, error) {
|
||||||
|
return LoadSources(LoadOptions{Insensitive: true}, source, others...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// InsensitiveLoad has exactly same functionality as Load function
|
||||||
|
// except it allows have shadow keys.
|
||||||
|
func ShadowLoad(source interface{}, others ...interface{}) (*File, error) {
|
||||||
|
return LoadSources(LoadOptions{AllowShadows: true}, source, others...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Empty returns an empty file object.
|
||||||
|
func Empty() *File {
|
||||||
|
// Ignore error here, we sure our data is good.
|
||||||
|
f, _ := Load([]byte(""))
|
||||||
|
return f
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewSection creates a new section.
|
||||||
|
func (f *File) NewSection(name string) (*Section, error) {
|
||||||
|
if len(name) == 0 {
|
||||||
|
return nil, errors.New("error creating new section: empty section name")
|
||||||
|
} else if f.options.Insensitive && name != DEFAULT_SECTION {
|
||||||
|
name = strings.ToLower(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if f.BlockMode {
|
||||||
|
f.lock.Lock()
|
||||||
|
defer f.lock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
if inSlice(name, f.sectionList) {
|
||||||
|
return f.sections[name], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
f.sectionList = append(f.sectionList, name)
|
||||||
|
f.sections[name] = newSection(f, name)
|
||||||
|
return f.sections[name], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewRawSection creates a new section with an unparseable body.
|
||||||
|
func (f *File) NewRawSection(name, body string) (*Section, error) {
|
||||||
|
section, err := f.NewSection(name)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
section.isRawSection = true
|
||||||
|
section.rawBody = body
|
||||||
|
return section, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewSections creates a list of sections.
|
||||||
|
func (f *File) NewSections(names ...string) (err error) {
|
||||||
|
for _, name := range names {
|
||||||
|
if _, err = f.NewSection(name); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSection returns section by given name.
|
||||||
|
func (f *File) GetSection(name string) (*Section, error) {
|
||||||
|
if len(name) == 0 {
|
||||||
|
name = DEFAULT_SECTION
|
||||||
|
} else if f.options.Insensitive {
|
||||||
|
name = strings.ToLower(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if f.BlockMode {
|
||||||
|
f.lock.RLock()
|
||||||
|
defer f.lock.RUnlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
sec := f.sections[name]
|
||||||
|
if sec == nil {
|
||||||
|
return nil, fmt.Errorf("section '%s' does not exist", name)
|
||||||
|
}
|
||||||
|
return sec, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Section assumes named section exists and returns a zero-value when not.
|
||||||
|
func (f *File) Section(name string) *Section {
|
||||||
|
sec, err := f.GetSection(name)
|
||||||
|
if err != nil {
|
||||||
|
// Note: It's OK here because the only possible error is empty section name,
|
||||||
|
// but if it's empty, this piece of code won't be executed.
|
||||||
|
sec, _ = f.NewSection(name)
|
||||||
|
return sec
|
||||||
|
}
|
||||||
|
return sec
|
||||||
|
}
|
||||||
|
|
||||||
|
// Section returns list of Section.
|
||||||
|
func (f *File) Sections() []*Section {
|
||||||
|
sections := make([]*Section, len(f.sectionList))
|
||||||
|
for i := range f.sectionList {
|
||||||
|
sections[i] = f.Section(f.sectionList[i])
|
||||||
|
}
|
||||||
|
return sections
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChildSections returns a list of child sections of given section name.
|
||||||
|
func (f *File) ChildSections(name string) []*Section {
|
||||||
|
return f.Section(name).ChildSections()
|
||||||
|
}
|
||||||
|
|
||||||
|
// SectionStrings returns list of section names.
|
||||||
|
func (f *File) SectionStrings() []string {
|
||||||
|
list := make([]string, len(f.sectionList))
|
||||||
|
copy(list, f.sectionList)
|
||||||
|
return list
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteSection deletes a section.
|
||||||
|
func (f *File) DeleteSection(name string) {
|
||||||
|
if f.BlockMode {
|
||||||
|
f.lock.Lock()
|
||||||
|
defer f.lock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(name) == 0 {
|
||||||
|
name = DEFAULT_SECTION
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, s := range f.sectionList {
|
||||||
|
if s == name {
|
||||||
|
f.sectionList = append(f.sectionList[:i], f.sectionList[i+1:]...)
|
||||||
|
delete(f.sections, name)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *File) reload(s dataSource) error {
|
||||||
|
r, err := s.ReadCloser()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer r.Close()
|
||||||
|
|
||||||
|
return f.parse(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reload reloads and parses all data sources.
|
||||||
|
func (f *File) Reload() (err error) {
|
||||||
|
for _, s := range f.dataSources {
|
||||||
|
if err = f.reload(s); err != nil {
|
||||||
|
// In loose mode, we create an empty default section for nonexistent files.
|
||||||
|
if os.IsNotExist(err) && f.options.Loose {
|
||||||
|
f.parse(bytes.NewBuffer(nil))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Append appends one or more data sources and reloads automatically.
|
||||||
|
func (f *File) Append(source interface{}, others ...interface{}) error {
|
||||||
|
ds, err := parseDataSource(source)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
f.dataSources = append(f.dataSources, ds)
|
||||||
|
for _, s := range others {
|
||||||
|
ds, err = parseDataSource(s)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
f.dataSources = append(f.dataSources, ds)
|
||||||
|
}
|
||||||
|
return f.Reload()
|
||||||
|
}
|
||||||
|
|
||||||
|
// WriteToIndent writes content into io.Writer with given indention.
|
||||||
|
// If PrettyFormat has been set to be true,
|
||||||
|
// it will align "=" sign with spaces under each section.
|
||||||
|
func (f *File) WriteToIndent(w io.Writer, indent string) (n int64, err error) {
|
||||||
|
equalSign := "="
|
||||||
|
if PrettyFormat {
|
||||||
|
equalSign = " = "
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use buffer to make sure target is safe until finish encoding.
|
||||||
|
buf := bytes.NewBuffer(nil)
|
||||||
|
for i, sname := range f.sectionList {
|
||||||
|
sec := f.Section(sname)
|
||||||
|
if len(sec.Comment) > 0 {
|
||||||
|
if sec.Comment[0] != '#' && sec.Comment[0] != ';' {
|
||||||
|
sec.Comment = "; " + sec.Comment
|
||||||
|
}
|
||||||
|
if _, err = buf.WriteString(sec.Comment + LineBreak); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if i > 0 || DefaultHeader {
|
||||||
|
if _, err = buf.WriteString("[" + sname + "]" + LineBreak); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Write nothing if default section is empty
|
||||||
|
if len(sec.keyList) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if sec.isRawSection {
|
||||||
|
if _, err = buf.WriteString(sec.rawBody); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// Count and generate alignment length and buffer spaces using the
|
||||||
|
// longest key. Keys may be modifed if they contain certain characters so
|
||||||
|
// we need to take that into account in our calculation.
|
||||||
|
alignLength := 0
|
||||||
|
if PrettyFormat {
|
||||||
|
for _, kname := range sec.keyList {
|
||||||
|
keyLength := len(kname)
|
||||||
|
// First case will surround key by ` and second by """
|
||||||
|
if strings.ContainsAny(kname, "\"=:") {
|
||||||
|
keyLength += 2
|
||||||
|
} else if strings.Contains(kname, "`") {
|
||||||
|
keyLength += 6
|
||||||
|
}
|
||||||
|
|
||||||
|
if keyLength > alignLength {
|
||||||
|
alignLength = keyLength
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
alignSpaces := bytes.Repeat([]byte(" "), alignLength)
|
||||||
|
|
||||||
|
KEY_LIST:
|
||||||
|
for _, kname := range sec.keyList {
|
||||||
|
key := sec.Key(kname)
|
||||||
|
if len(key.Comment) > 0 {
|
||||||
|
if len(indent) > 0 && sname != DEFAULT_SECTION {
|
||||||
|
buf.WriteString(indent)
|
||||||
|
}
|
||||||
|
if key.Comment[0] != '#' && key.Comment[0] != ';' {
|
||||||
|
key.Comment = "; " + key.Comment
|
||||||
|
}
|
||||||
|
if _, err = buf.WriteString(key.Comment + LineBreak); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(indent) > 0 && sname != DEFAULT_SECTION {
|
||||||
|
buf.WriteString(indent)
|
||||||
|
}
|
||||||
|
|
||||||
|
switch {
|
||||||
|
case key.isAutoIncrement:
|
||||||
|
kname = "-"
|
||||||
|
case strings.ContainsAny(kname, "\"=:"):
|
||||||
|
kname = "`" + kname + "`"
|
||||||
|
case strings.Contains(kname, "`"):
|
||||||
|
kname = `"""` + kname + `"""`
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, val := range key.ValueWithShadows() {
|
||||||
|
if _, err = buf.WriteString(kname); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if key.isBooleanType {
|
||||||
|
if kname != sec.keyList[len(sec.keyList)-1] {
|
||||||
|
buf.WriteString(LineBreak)
|
||||||
|
}
|
||||||
|
continue KEY_LIST
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write out alignment spaces before "=" sign
|
||||||
|
if PrettyFormat {
|
||||||
|
buf.Write(alignSpaces[:alignLength-len(kname)])
|
||||||
|
}
|
||||||
|
|
||||||
|
// In case key value contains "\n", "`", "\"", "#" or ";"
|
||||||
|
if strings.ContainsAny(val, "\n`") {
|
||||||
|
val = `"""` + val + `"""`
|
||||||
|
} else if strings.ContainsAny(val, "#;") {
|
||||||
|
val = "`" + val + "`"
|
||||||
|
}
|
||||||
|
if _, err = buf.WriteString(equalSign + val + LineBreak); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Put a line between sections
|
||||||
|
if _, err = buf.WriteString(LineBreak); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return buf.WriteTo(w)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WriteTo writes file content into io.Writer.
|
||||||
|
func (f *File) WriteTo(w io.Writer) (int64, error) {
|
||||||
|
return f.WriteToIndent(w, "")
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveToIndent writes content to file system with given value indention.
|
||||||
|
func (f *File) SaveToIndent(filename, indent string) error {
|
||||||
|
// Note: Because we are truncating with os.Create,
|
||||||
|
// so it's safer to save to a temporary file location and rename afte done.
|
||||||
|
tmpPath := filename + "." + strconv.Itoa(time.Now().Nanosecond()) + ".tmp"
|
||||||
|
defer os.Remove(tmpPath)
|
||||||
|
|
||||||
|
fw, err := os.Create(tmpPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err = f.WriteToIndent(fw, indent); err != nil {
|
||||||
|
fw.Close()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
fw.Close()
|
||||||
|
|
||||||
|
// Remove old file and rename the new one.
|
||||||
|
os.Remove(filename)
|
||||||
|
return os.Rename(tmpPath, filename)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveTo writes content to file system.
|
||||||
|
func (f *File) SaveTo(filename string) error {
|
||||||
|
return f.SaveToIndent(filename, "")
|
||||||
|
}
|
484
vendor/src/github.com/go-ini/ini/ini_test.go
vendored
Normal file
484
vendor/src/github.com/go-ini/ini/ini_test.go
vendored
Normal file
|
@ -0,0 +1,484 @@
|
||||||
|
// Copyright 2014 Unknwon
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||||
|
// not use this file except in compliance with the License. You may obtain
|
||||||
|
// a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
// License for the specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
package ini
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"io/ioutil"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
. "github.com/smartystreets/goconvey/convey"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Test_Version(t *testing.T) {
|
||||||
|
Convey("Get version", t, func() {
|
||||||
|
So(Version(), ShouldEqual, _VERSION)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const _CONF_DATA = `
|
||||||
|
; Package name
|
||||||
|
NAME = ini
|
||||||
|
; Package version
|
||||||
|
VERSION = v1
|
||||||
|
; Package import path
|
||||||
|
IMPORT_PATH = gopkg.in/%(NAME)s.%(VERSION)s
|
||||||
|
|
||||||
|
# Information about package author
|
||||||
|
# Bio can be written in multiple lines.
|
||||||
|
[author]
|
||||||
|
NAME = Unknwon ; Succeeding comment
|
||||||
|
E-MAIL = fake@localhost
|
||||||
|
GITHUB = https://github.com/%(NAME)s
|
||||||
|
BIO = """Gopher.
|
||||||
|
Coding addict.
|
||||||
|
Good man.
|
||||||
|
""" # Succeeding comment
|
||||||
|
|
||||||
|
[package]
|
||||||
|
CLONE_URL = https://%(IMPORT_PATH)s
|
||||||
|
|
||||||
|
[package.sub]
|
||||||
|
UNUSED_KEY = should be deleted
|
||||||
|
|
||||||
|
[features]
|
||||||
|
-: Support read/write comments of keys and sections
|
||||||
|
-: Support auto-increment of key names
|
||||||
|
-: Support load multiple files to overwrite key values
|
||||||
|
|
||||||
|
[types]
|
||||||
|
STRING = str
|
||||||
|
BOOL = true
|
||||||
|
BOOL_FALSE = false
|
||||||
|
FLOAT64 = 1.25
|
||||||
|
INT = 10
|
||||||
|
TIME = 2015-01-01T20:17:05Z
|
||||||
|
DURATION = 2h45m
|
||||||
|
UINT = 3
|
||||||
|
|
||||||
|
[array]
|
||||||
|
STRINGS = en, zh, de
|
||||||
|
FLOAT64S = 1.1, 2.2, 3.3
|
||||||
|
INTS = 1, 2, 3
|
||||||
|
UINTS = 1, 2, 3
|
||||||
|
TIMES = 2015-01-01T20:17:05Z,2015-01-01T20:17:05Z,2015-01-01T20:17:05Z
|
||||||
|
|
||||||
|
[note]
|
||||||
|
empty_lines = next line is empty\
|
||||||
|
|
||||||
|
; Comment before the section
|
||||||
|
[comments] ; This is a comment for the section too
|
||||||
|
; Comment before key
|
||||||
|
key = "value"
|
||||||
|
key2 = "value2" ; This is a comment for key2
|
||||||
|
key3 = "one", "two", "three"
|
||||||
|
|
||||||
|
[advance]
|
||||||
|
value with quotes = "some value"
|
||||||
|
value quote2 again = 'some value'
|
||||||
|
includes comment sign = ` + "`" + "my#password" + "`" + `
|
||||||
|
includes comment sign2 = ` + "`" + "my;password" + "`" + `
|
||||||
|
true = 2+3=5
|
||||||
|
"1+1=2" = true
|
||||||
|
"""6+1=7""" = true
|
||||||
|
"""` + "`" + `5+5` + "`" + `""" = 10
|
||||||
|
` + "`" + `"6+6"` + "`" + ` = 12
|
||||||
|
` + "`" + `7-2=4` + "`" + ` = false
|
||||||
|
ADDRESS = ` + "`" + `404 road,
|
||||||
|
NotFound, State, 50000` + "`" + `
|
||||||
|
|
||||||
|
two_lines = how about \
|
||||||
|
continuation lines?
|
||||||
|
lots_of_lines = 1 \
|
||||||
|
2 \
|
||||||
|
3 \
|
||||||
|
4 \
|
||||||
|
`
|
||||||
|
|
||||||
|
func Test_Load(t *testing.T) {
|
||||||
|
Convey("Load from data sources", t, func() {
|
||||||
|
|
||||||
|
Convey("Load with empty data", func() {
|
||||||
|
So(Empty(), ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Load with multiple data sources", func() {
|
||||||
|
cfg, err := Load([]byte(_CONF_DATA), "testdata/conf.ini", ioutil.NopCloser(bytes.NewReader([]byte(_CONF_DATA))))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
f, err := Load([]byte(_CONF_DATA), "testdata/404.ini")
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
So(f, ShouldBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Load with io.ReadCloser", func() {
|
||||||
|
cfg, err := Load(ioutil.NopCloser(bytes.NewReader([]byte(_CONF_DATA))))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
So(cfg.Section("").Key("NAME").String(), ShouldEqual, "ini")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Bad load process", t, func() {
|
||||||
|
|
||||||
|
Convey("Load from invalid data sources", func() {
|
||||||
|
_, err := Load(_CONF_DATA)
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
f, err := Load("testdata/404.ini")
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
So(f, ShouldBeNil)
|
||||||
|
|
||||||
|
_, err = Load(1)
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
_, err = Load([]byte(""), 1)
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Load with bad section name", func() {
|
||||||
|
_, err := Load([]byte("[]"))
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
_, err = Load([]byte("["))
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Load with bad keys", func() {
|
||||||
|
_, err := Load([]byte(`"""name`))
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
_, err = Load([]byte(`"""name"""`))
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
_, err = Load([]byte(`""=1`))
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
_, err = Load([]byte(`=`))
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
_, err = Load([]byte(`name`))
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Load with bad values", func() {
|
||||||
|
_, err := Load([]byte(`name="""Unknwon`))
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get section and key insensitively", t, func() {
|
||||||
|
cfg, err := InsensitiveLoad([]byte(_CONF_DATA), "testdata/conf.ini")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
sec, err := cfg.GetSection("Author")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(sec, ShouldNotBeNil)
|
||||||
|
|
||||||
|
key, err := sec.GetKey("E-mail")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(key, ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Load with ignoring continuation lines", t, func() {
|
||||||
|
cfg, err := LoadSources(LoadOptions{IgnoreContinuation: true}, []byte(`key1=a\b\
|
||||||
|
key2=c\d\`))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
So(cfg.Section("").Key("key1").String(), ShouldEqual, `a\b\`)
|
||||||
|
So(cfg.Section("").Key("key2").String(), ShouldEqual, `c\d\`)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Load with ignoring inline comments", t, func() {
|
||||||
|
cfg, err := LoadSources(LoadOptions{IgnoreInlineComment: true}, []byte(`key1=value ;comment
|
||||||
|
key2=value #comment2`))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
So(cfg.Section("").Key("key1").String(), ShouldEqual, `value ;comment`)
|
||||||
|
So(cfg.Section("").Key("key2").String(), ShouldEqual, `value #comment2`)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Load with boolean type keys", t, func() {
|
||||||
|
cfg, err := LoadSources(LoadOptions{AllowBooleanKeys: true}, []byte(`key1=hello
|
||||||
|
key2
|
||||||
|
#key3
|
||||||
|
key4
|
||||||
|
key5`))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
So(strings.Join(cfg.Section("").KeyStrings(), ","), ShouldEqual, "key1,key2,key4,key5")
|
||||||
|
So(cfg.Section("").Key("key2").MustBool(false), ShouldBeTrue)
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
cfg.WriteTo(&buf)
|
||||||
|
// there is always a trailing \n at the end of the section
|
||||||
|
So(buf.String(), ShouldEqual, `key1 = hello
|
||||||
|
key2
|
||||||
|
#key3
|
||||||
|
key4
|
||||||
|
key5
|
||||||
|
`)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func Test_File_ChildSections(t *testing.T) {
|
||||||
|
Convey("Find child sections by parent name", t, func() {
|
||||||
|
cfg, err := Load([]byte(`
|
||||||
|
[node]
|
||||||
|
|
||||||
|
[node.biz1]
|
||||||
|
|
||||||
|
[node.biz2]
|
||||||
|
|
||||||
|
[node.biz3]
|
||||||
|
|
||||||
|
[node.bizN]
|
||||||
|
`))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
children := cfg.ChildSections("node")
|
||||||
|
names := make([]string, len(children))
|
||||||
|
for i := range children {
|
||||||
|
names[i] = children[i].name
|
||||||
|
}
|
||||||
|
So(strings.Join(names, ","), ShouldEqual, "node.biz1,node.biz2,node.biz3,node.bizN")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func Test_LooseLoad(t *testing.T) {
|
||||||
|
Convey("Loose load from data sources", t, func() {
|
||||||
|
Convey("Loose load mixed with nonexistent file", func() {
|
||||||
|
cfg, err := LooseLoad("testdata/404.ini")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
var fake struct {
|
||||||
|
Name string `ini:"name"`
|
||||||
|
}
|
||||||
|
So(cfg.MapTo(&fake), ShouldBeNil)
|
||||||
|
|
||||||
|
cfg, err = LooseLoad([]byte("name=Unknwon"), "testdata/404.ini")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg.Section("").Key("name").String(), ShouldEqual, "Unknwon")
|
||||||
|
So(cfg.MapTo(&fake), ShouldBeNil)
|
||||||
|
So(fake.Name, ShouldEqual, "Unknwon")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
func Test_File_Append(t *testing.T) {
|
||||||
|
Convey("Append data sources", t, func() {
|
||||||
|
cfg, err := Load([]byte(""))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
So(cfg.Append([]byte(""), []byte("")), ShouldBeNil)
|
||||||
|
|
||||||
|
Convey("Append bad data sources", func() {
|
||||||
|
So(cfg.Append(1), ShouldNotBeNil)
|
||||||
|
So(cfg.Append([]byte(""), 1), ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func Test_File_WriteTo(t *testing.T) {
|
||||||
|
Convey("Write to somewhere", t, func() {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
cfg := Empty()
|
||||||
|
cfg.WriteTo(&buf)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func Test_File_SaveTo_WriteTo(t *testing.T) {
|
||||||
|
Convey("Save file", t, func() {
|
||||||
|
cfg, err := Load([]byte(_CONF_DATA), "testdata/conf.ini")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
cfg.Section("").Key("NAME").Comment = "Package name"
|
||||||
|
cfg.Section("author").Comment = `Information about package author
|
||||||
|
# Bio can be written in multiple lines.`
|
||||||
|
cfg.Section("advanced").Key("val w/ pound").SetValue("my#password")
|
||||||
|
cfg.Section("advanced").Key("longest key has a colon : yes/no").SetValue("yes")
|
||||||
|
So(cfg.SaveTo("testdata/conf_out.ini"), ShouldBeNil)
|
||||||
|
|
||||||
|
cfg.Section("author").Key("NAME").Comment = "This is author name"
|
||||||
|
|
||||||
|
So(cfg.SaveToIndent("testdata/conf_out.ini", "\t"), ShouldBeNil)
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
_, err = cfg.WriteToIndent(&buf, "\t")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(buf.String(), ShouldEqual, `; Package name
|
||||||
|
NAME = ini
|
||||||
|
; Package version
|
||||||
|
VERSION = v1
|
||||||
|
; Package import path
|
||||||
|
IMPORT_PATH = gopkg.in/%(NAME)s.%(VERSION)s
|
||||||
|
|
||||||
|
; Information about package author
|
||||||
|
# Bio can be written in multiple lines.
|
||||||
|
[author]
|
||||||
|
; This is author name
|
||||||
|
NAME = Unknwon
|
||||||
|
E-MAIL = u@gogs.io
|
||||||
|
GITHUB = https://github.com/%(NAME)s
|
||||||
|
# Succeeding comment
|
||||||
|
BIO = """Gopher.
|
||||||
|
Coding addict.
|
||||||
|
Good man.
|
||||||
|
"""
|
||||||
|
|
||||||
|
[package]
|
||||||
|
CLONE_URL = https://%(IMPORT_PATH)s
|
||||||
|
|
||||||
|
[package.sub]
|
||||||
|
UNUSED_KEY = should be deleted
|
||||||
|
|
||||||
|
[features]
|
||||||
|
- = Support read/write comments of keys and sections
|
||||||
|
- = Support auto-increment of key names
|
||||||
|
- = Support load multiple files to overwrite key values
|
||||||
|
|
||||||
|
[types]
|
||||||
|
STRING = str
|
||||||
|
BOOL = true
|
||||||
|
BOOL_FALSE = false
|
||||||
|
FLOAT64 = 1.25
|
||||||
|
INT = 10
|
||||||
|
TIME = 2015-01-01T20:17:05Z
|
||||||
|
DURATION = 2h45m
|
||||||
|
UINT = 3
|
||||||
|
|
||||||
|
[array]
|
||||||
|
STRINGS = en, zh, de
|
||||||
|
FLOAT64S = 1.1, 2.2, 3.3
|
||||||
|
INTS = 1, 2, 3
|
||||||
|
UINTS = 1, 2, 3
|
||||||
|
TIMES = 2015-01-01T20:17:05Z,2015-01-01T20:17:05Z,2015-01-01T20:17:05Z
|
||||||
|
|
||||||
|
[note]
|
||||||
|
empty_lines = next line is empty
|
||||||
|
|
||||||
|
; Comment before the section
|
||||||
|
; This is a comment for the section too
|
||||||
|
[comments]
|
||||||
|
; Comment before key
|
||||||
|
key = value
|
||||||
|
; This is a comment for key2
|
||||||
|
key2 = value2
|
||||||
|
key3 = "one", "two", "three"
|
||||||
|
|
||||||
|
[advance]
|
||||||
|
value with quotes = some value
|
||||||
|
value quote2 again = some value
|
||||||
|
includes comment sign = `+"`"+"my#password"+"`"+`
|
||||||
|
includes comment sign2 = `+"`"+"my;password"+"`"+`
|
||||||
|
true = 2+3=5
|
||||||
|
`+"`"+`1+1=2`+"`"+` = true
|
||||||
|
`+"`"+`6+1=7`+"`"+` = true
|
||||||
|
"""`+"`"+`5+5`+"`"+`""" = 10
|
||||||
|
`+"`"+`"6+6"`+"`"+` = 12
|
||||||
|
`+"`"+`7-2=4`+"`"+` = false
|
||||||
|
ADDRESS = """404 road,
|
||||||
|
NotFound, State, 50000"""
|
||||||
|
two_lines = how about continuation lines?
|
||||||
|
lots_of_lines = 1 2 3 4
|
||||||
|
|
||||||
|
[advanced]
|
||||||
|
val w/ pound = `+"`"+`my#password`+"`"+`
|
||||||
|
`+"`"+`longest key has a colon : yes/no`+"`"+` = yes
|
||||||
|
|
||||||
|
`)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func Test_File_WriteTo_SectionRaw(t *testing.T) {
|
||||||
|
Convey("Write a INI with a raw section", t, func() {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
cfg, err := LoadSources(
|
||||||
|
LoadOptions{
|
||||||
|
UnparseableSections: []string{"CORE_LESSON", "COMMENTS"},
|
||||||
|
},
|
||||||
|
"testdata/aicc.ini")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
cfg.WriteToIndent(&buf, "\t")
|
||||||
|
So(buf.String(), ShouldEqual, `[Core]
|
||||||
|
Lesson_Location = 87
|
||||||
|
Lesson_Status = C
|
||||||
|
Score = 3
|
||||||
|
Time = 00:02:30
|
||||||
|
|
||||||
|
[CORE_LESSON]
|
||||||
|
my lesson state data – 1111111111111111111000000000000000001110000
|
||||||
|
111111111111111111100000000000111000000000 – end my lesson state data
|
||||||
|
[COMMENTS]
|
||||||
|
<1><L.Slide#2> This slide has the fuel listed in the wrong units <e.1>
|
||||||
|
`)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helpers for slice tests.
|
||||||
|
func float64sEqual(values []float64, expected ...float64) {
|
||||||
|
So(values, ShouldHaveLength, len(expected))
|
||||||
|
for i, v := range expected {
|
||||||
|
So(values[i], ShouldEqual, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func intsEqual(values []int, expected ...int) {
|
||||||
|
So(values, ShouldHaveLength, len(expected))
|
||||||
|
for i, v := range expected {
|
||||||
|
So(values[i], ShouldEqual, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func int64sEqual(values []int64, expected ...int64) {
|
||||||
|
So(values, ShouldHaveLength, len(expected))
|
||||||
|
for i, v := range expected {
|
||||||
|
So(values[i], ShouldEqual, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func uintsEqual(values []uint, expected ...uint) {
|
||||||
|
So(values, ShouldHaveLength, len(expected))
|
||||||
|
for i, v := range expected {
|
||||||
|
So(values[i], ShouldEqual, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func uint64sEqual(values []uint64, expected ...uint64) {
|
||||||
|
So(values, ShouldHaveLength, len(expected))
|
||||||
|
for i, v := range expected {
|
||||||
|
So(values[i], ShouldEqual, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func timesEqual(values []time.Time, expected ...time.Time) {
|
||||||
|
So(values, ShouldHaveLength, len(expected))
|
||||||
|
for i, v := range expected {
|
||||||
|
So(values[i].String(), ShouldEqual, v.String())
|
||||||
|
}
|
||||||
|
}
|
699
vendor/src/github.com/go-ini/ini/key.go
vendored
Normal file
699
vendor/src/github.com/go-ini/ini/key.go
vendored
Normal file
|
@ -0,0 +1,699 @@
|
||||||
|
// Copyright 2014 Unknwon
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||||
|
// not use this file except in compliance with the License. You may obtain
|
||||||
|
// a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
// License for the specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
package ini
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Key represents a key under a section.
|
||||||
|
type Key struct {
|
||||||
|
s *Section
|
||||||
|
name string
|
||||||
|
value string
|
||||||
|
isAutoIncrement bool
|
||||||
|
isBooleanType bool
|
||||||
|
|
||||||
|
isShadow bool
|
||||||
|
shadows []*Key
|
||||||
|
|
||||||
|
Comment string
|
||||||
|
}
|
||||||
|
|
||||||
|
// newKey simply return a key object with given values.
|
||||||
|
func newKey(s *Section, name, val string) *Key {
|
||||||
|
return &Key{
|
||||||
|
s: s,
|
||||||
|
name: name,
|
||||||
|
value: val,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *Key) addShadow(val string) error {
|
||||||
|
if k.isShadow {
|
||||||
|
return errors.New("cannot add shadow to another shadow key")
|
||||||
|
} else if k.isAutoIncrement || k.isBooleanType {
|
||||||
|
return errors.New("cannot add shadow to auto-increment or boolean key")
|
||||||
|
}
|
||||||
|
|
||||||
|
shadow := newKey(k.s, k.name, val)
|
||||||
|
shadow.isShadow = true
|
||||||
|
k.shadows = append(k.shadows, shadow)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddShadow adds a new shadow key to itself.
|
||||||
|
func (k *Key) AddShadow(val string) error {
|
||||||
|
if !k.s.f.options.AllowShadows {
|
||||||
|
return errors.New("shadow key is not allowed")
|
||||||
|
}
|
||||||
|
return k.addShadow(val)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValueMapper represents a mapping function for values, e.g. os.ExpandEnv
|
||||||
|
type ValueMapper func(string) string
|
||||||
|
|
||||||
|
// Name returns name of key.
|
||||||
|
func (k *Key) Name() string {
|
||||||
|
return k.name
|
||||||
|
}
|
||||||
|
|
||||||
|
// Value returns raw value of key for performance purpose.
|
||||||
|
func (k *Key) Value() string {
|
||||||
|
return k.value
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValueWithShadows returns raw values of key and its shadows if any.
|
||||||
|
func (k *Key) ValueWithShadows() []string {
|
||||||
|
if len(k.shadows) == 0 {
|
||||||
|
return []string{k.value}
|
||||||
|
}
|
||||||
|
vals := make([]string, len(k.shadows)+1)
|
||||||
|
vals[0] = k.value
|
||||||
|
for i := range k.shadows {
|
||||||
|
vals[i+1] = k.shadows[i].value
|
||||||
|
}
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// transformValue takes a raw value and transforms to its final string.
|
||||||
|
func (k *Key) transformValue(val string) string {
|
||||||
|
if k.s.f.ValueMapper != nil {
|
||||||
|
val = k.s.f.ValueMapper(val)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fail-fast if no indicate char found for recursive value
|
||||||
|
if !strings.Contains(val, "%") {
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
for i := 0; i < _DEPTH_VALUES; i++ {
|
||||||
|
vr := varPattern.FindString(val)
|
||||||
|
if len(vr) == 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
// Take off leading '%(' and trailing ')s'.
|
||||||
|
noption := strings.TrimLeft(vr, "%(")
|
||||||
|
noption = strings.TrimRight(noption, ")s")
|
||||||
|
|
||||||
|
// Search in the same section.
|
||||||
|
nk, err := k.s.GetKey(noption)
|
||||||
|
if err != nil {
|
||||||
|
// Search again in default section.
|
||||||
|
nk, _ = k.s.f.Section("").GetKey(noption)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Substitute by new value and take off leading '%(' and trailing ')s'.
|
||||||
|
val = strings.Replace(val, vr, nk.value, -1)
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// String returns string representation of value.
|
||||||
|
func (k *Key) String() string {
|
||||||
|
return k.transformValue(k.value)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate accepts a validate function which can
|
||||||
|
// return modifed result as key value.
|
||||||
|
func (k *Key) Validate(fn func(string) string) string {
|
||||||
|
return fn(k.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseBool returns the boolean value represented by the string.
|
||||||
|
//
|
||||||
|
// It accepts 1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On,
|
||||||
|
// 0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off.
|
||||||
|
// Any other value returns an error.
|
||||||
|
func parseBool(str string) (value bool, err error) {
|
||||||
|
switch str {
|
||||||
|
case "1", "t", "T", "true", "TRUE", "True", "YES", "yes", "Yes", "y", "ON", "on", "On":
|
||||||
|
return true, nil
|
||||||
|
case "0", "f", "F", "false", "FALSE", "False", "NO", "no", "No", "n", "OFF", "off", "Off":
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
return false, fmt.Errorf("parsing \"%s\": invalid syntax", str)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bool returns bool type value.
|
||||||
|
func (k *Key) Bool() (bool, error) {
|
||||||
|
return parseBool(k.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Float64 returns float64 type value.
|
||||||
|
func (k *Key) Float64() (float64, error) {
|
||||||
|
return strconv.ParseFloat(k.String(), 64)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Int returns int type value.
|
||||||
|
func (k *Key) Int() (int, error) {
|
||||||
|
return strconv.Atoi(k.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Int64 returns int64 type value.
|
||||||
|
func (k *Key) Int64() (int64, error) {
|
||||||
|
return strconv.ParseInt(k.String(), 10, 64)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Uint returns uint type valued.
|
||||||
|
func (k *Key) Uint() (uint, error) {
|
||||||
|
u, e := strconv.ParseUint(k.String(), 10, 64)
|
||||||
|
return uint(u), e
|
||||||
|
}
|
||||||
|
|
||||||
|
// Uint64 returns uint64 type value.
|
||||||
|
func (k *Key) Uint64() (uint64, error) {
|
||||||
|
return strconv.ParseUint(k.String(), 10, 64)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Duration returns time.Duration type value.
|
||||||
|
func (k *Key) Duration() (time.Duration, error) {
|
||||||
|
return time.ParseDuration(k.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// TimeFormat parses with given format and returns time.Time type value.
|
||||||
|
func (k *Key) TimeFormat(format string) (time.Time, error) {
|
||||||
|
return time.Parse(format, k.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Time parses with RFC3339 format and returns time.Time type value.
|
||||||
|
func (k *Key) Time() (time.Time, error) {
|
||||||
|
return k.TimeFormat(time.RFC3339)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustString returns default value if key value is empty.
|
||||||
|
func (k *Key) MustString(defaultVal string) string {
|
||||||
|
val := k.String()
|
||||||
|
if len(val) == 0 {
|
||||||
|
k.value = defaultVal
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustBool always returns value without error,
|
||||||
|
// it returns false if error occurs.
|
||||||
|
func (k *Key) MustBool(defaultVal ...bool) bool {
|
||||||
|
val, err := k.Bool()
|
||||||
|
if len(defaultVal) > 0 && err != nil {
|
||||||
|
k.value = strconv.FormatBool(defaultVal[0])
|
||||||
|
return defaultVal[0]
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustFloat64 always returns value without error,
|
||||||
|
// it returns 0.0 if error occurs.
|
||||||
|
func (k *Key) MustFloat64(defaultVal ...float64) float64 {
|
||||||
|
val, err := k.Float64()
|
||||||
|
if len(defaultVal) > 0 && err != nil {
|
||||||
|
k.value = strconv.FormatFloat(defaultVal[0], 'f', -1, 64)
|
||||||
|
return defaultVal[0]
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustInt always returns value without error,
|
||||||
|
// it returns 0 if error occurs.
|
||||||
|
func (k *Key) MustInt(defaultVal ...int) int {
|
||||||
|
val, err := k.Int()
|
||||||
|
if len(defaultVal) > 0 && err != nil {
|
||||||
|
k.value = strconv.FormatInt(int64(defaultVal[0]), 10)
|
||||||
|
return defaultVal[0]
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustInt64 always returns value without error,
|
||||||
|
// it returns 0 if error occurs.
|
||||||
|
func (k *Key) MustInt64(defaultVal ...int64) int64 {
|
||||||
|
val, err := k.Int64()
|
||||||
|
if len(defaultVal) > 0 && err != nil {
|
||||||
|
k.value = strconv.FormatInt(defaultVal[0], 10)
|
||||||
|
return defaultVal[0]
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustUint always returns value without error,
|
||||||
|
// it returns 0 if error occurs.
|
||||||
|
func (k *Key) MustUint(defaultVal ...uint) uint {
|
||||||
|
val, err := k.Uint()
|
||||||
|
if len(defaultVal) > 0 && err != nil {
|
||||||
|
k.value = strconv.FormatUint(uint64(defaultVal[0]), 10)
|
||||||
|
return defaultVal[0]
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustUint64 always returns value without error,
|
||||||
|
// it returns 0 if error occurs.
|
||||||
|
func (k *Key) MustUint64(defaultVal ...uint64) uint64 {
|
||||||
|
val, err := k.Uint64()
|
||||||
|
if len(defaultVal) > 0 && err != nil {
|
||||||
|
k.value = strconv.FormatUint(defaultVal[0], 10)
|
||||||
|
return defaultVal[0]
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustDuration always returns value without error,
|
||||||
|
// it returns zero value if error occurs.
|
||||||
|
func (k *Key) MustDuration(defaultVal ...time.Duration) time.Duration {
|
||||||
|
val, err := k.Duration()
|
||||||
|
if len(defaultVal) > 0 && err != nil {
|
||||||
|
k.value = defaultVal[0].String()
|
||||||
|
return defaultVal[0]
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustTimeFormat always parses with given format and returns value without error,
|
||||||
|
// it returns zero value if error occurs.
|
||||||
|
func (k *Key) MustTimeFormat(format string, defaultVal ...time.Time) time.Time {
|
||||||
|
val, err := k.TimeFormat(format)
|
||||||
|
if len(defaultVal) > 0 && err != nil {
|
||||||
|
k.value = defaultVal[0].Format(format)
|
||||||
|
return defaultVal[0]
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustTime always parses with RFC3339 format and returns value without error,
|
||||||
|
// it returns zero value if error occurs.
|
||||||
|
func (k *Key) MustTime(defaultVal ...time.Time) time.Time {
|
||||||
|
return k.MustTimeFormat(time.RFC3339, defaultVal...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// In always returns value without error,
|
||||||
|
// it returns default value if error occurs or doesn't fit into candidates.
|
||||||
|
func (k *Key) In(defaultVal string, candidates []string) string {
|
||||||
|
val := k.String()
|
||||||
|
for _, cand := range candidates {
|
||||||
|
if val == cand {
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
|
||||||
|
// InFloat64 always returns value without error,
|
||||||
|
// it returns default value if error occurs or doesn't fit into candidates.
|
||||||
|
func (k *Key) InFloat64(defaultVal float64, candidates []float64) float64 {
|
||||||
|
val := k.MustFloat64()
|
||||||
|
for _, cand := range candidates {
|
||||||
|
if val == cand {
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
|
||||||
|
// InInt always returns value without error,
|
||||||
|
// it returns default value if error occurs or doesn't fit into candidates.
|
||||||
|
func (k *Key) InInt(defaultVal int, candidates []int) int {
|
||||||
|
val := k.MustInt()
|
||||||
|
for _, cand := range candidates {
|
||||||
|
if val == cand {
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
|
||||||
|
// InInt64 always returns value without error,
|
||||||
|
// it returns default value if error occurs or doesn't fit into candidates.
|
||||||
|
func (k *Key) InInt64(defaultVal int64, candidates []int64) int64 {
|
||||||
|
val := k.MustInt64()
|
||||||
|
for _, cand := range candidates {
|
||||||
|
if val == cand {
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
|
||||||
|
// InUint always returns value without error,
|
||||||
|
// it returns default value if error occurs or doesn't fit into candidates.
|
||||||
|
func (k *Key) InUint(defaultVal uint, candidates []uint) uint {
|
||||||
|
val := k.MustUint()
|
||||||
|
for _, cand := range candidates {
|
||||||
|
if val == cand {
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
|
||||||
|
// InUint64 always returns value without error,
|
||||||
|
// it returns default value if error occurs or doesn't fit into candidates.
|
||||||
|
func (k *Key) InUint64(defaultVal uint64, candidates []uint64) uint64 {
|
||||||
|
val := k.MustUint64()
|
||||||
|
for _, cand := range candidates {
|
||||||
|
if val == cand {
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
|
||||||
|
// InTimeFormat always parses with given format and returns value without error,
|
||||||
|
// it returns default value if error occurs or doesn't fit into candidates.
|
||||||
|
func (k *Key) InTimeFormat(format string, defaultVal time.Time, candidates []time.Time) time.Time {
|
||||||
|
val := k.MustTimeFormat(format)
|
||||||
|
for _, cand := range candidates {
|
||||||
|
if val == cand {
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
|
||||||
|
// InTime always parses with RFC3339 format and returns value without error,
|
||||||
|
// it returns default value if error occurs or doesn't fit into candidates.
|
||||||
|
func (k *Key) InTime(defaultVal time.Time, candidates []time.Time) time.Time {
|
||||||
|
return k.InTimeFormat(time.RFC3339, defaultVal, candidates)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RangeFloat64 checks if value is in given range inclusively,
|
||||||
|
// and returns default value if it's not.
|
||||||
|
func (k *Key) RangeFloat64(defaultVal, min, max float64) float64 {
|
||||||
|
val := k.MustFloat64()
|
||||||
|
if val < min || val > max {
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// RangeInt checks if value is in given range inclusively,
|
||||||
|
// and returns default value if it's not.
|
||||||
|
func (k *Key) RangeInt(defaultVal, min, max int) int {
|
||||||
|
val := k.MustInt()
|
||||||
|
if val < min || val > max {
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// RangeInt64 checks if value is in given range inclusively,
|
||||||
|
// and returns default value if it's not.
|
||||||
|
func (k *Key) RangeInt64(defaultVal, min, max int64) int64 {
|
||||||
|
val := k.MustInt64()
|
||||||
|
if val < min || val > max {
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// RangeTimeFormat checks if value with given format is in given range inclusively,
|
||||||
|
// and returns default value if it's not.
|
||||||
|
func (k *Key) RangeTimeFormat(format string, defaultVal, min, max time.Time) time.Time {
|
||||||
|
val := k.MustTimeFormat(format)
|
||||||
|
if val.Unix() < min.Unix() || val.Unix() > max.Unix() {
|
||||||
|
return defaultVal
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
|
||||||
|
// RangeTime checks if value with RFC3339 format is in given range inclusively,
|
||||||
|
// and returns default value if it's not.
|
||||||
|
func (k *Key) RangeTime(defaultVal, min, max time.Time) time.Time {
|
||||||
|
return k.RangeTimeFormat(time.RFC3339, defaultVal, min, max)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Strings returns list of string divided by given delimiter.
|
||||||
|
func (k *Key) Strings(delim string) []string {
|
||||||
|
str := k.String()
|
||||||
|
if len(str) == 0 {
|
||||||
|
return []string{}
|
||||||
|
}
|
||||||
|
|
||||||
|
vals := strings.Split(str, delim)
|
||||||
|
for i := range vals {
|
||||||
|
// vals[i] = k.transformValue(strings.TrimSpace(vals[i]))
|
||||||
|
vals[i] = strings.TrimSpace(vals[i])
|
||||||
|
}
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// StringsWithShadows returns list of string divided by given delimiter.
|
||||||
|
// Shadows will also be appended if any.
|
||||||
|
func (k *Key) StringsWithShadows(delim string) []string {
|
||||||
|
vals := k.ValueWithShadows()
|
||||||
|
results := make([]string, 0, len(vals)*2)
|
||||||
|
for i := range vals {
|
||||||
|
if len(vals) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
results = append(results, strings.Split(vals[i], delim)...)
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := range results {
|
||||||
|
results[i] = k.transformValue(strings.TrimSpace(results[i]))
|
||||||
|
}
|
||||||
|
return results
|
||||||
|
}
|
||||||
|
|
||||||
|
// Float64s returns list of float64 divided by given delimiter. Any invalid input will be treated as zero value.
|
||||||
|
func (k *Key) Float64s(delim string) []float64 {
|
||||||
|
vals, _ := k.parseFloat64s(k.Strings(delim), true, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ints returns list of int divided by given delimiter. Any invalid input will be treated as zero value.
|
||||||
|
func (k *Key) Ints(delim string) []int {
|
||||||
|
vals, _ := k.parseInts(k.Strings(delim), true, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// Int64s returns list of int64 divided by given delimiter. Any invalid input will be treated as zero value.
|
||||||
|
func (k *Key) Int64s(delim string) []int64 {
|
||||||
|
vals, _ := k.parseInt64s(k.Strings(delim), true, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// Uints returns list of uint divided by given delimiter. Any invalid input will be treated as zero value.
|
||||||
|
func (k *Key) Uints(delim string) []uint {
|
||||||
|
vals, _ := k.parseUints(k.Strings(delim), true, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// Uint64s returns list of uint64 divided by given delimiter. Any invalid input will be treated as zero value.
|
||||||
|
func (k *Key) Uint64s(delim string) []uint64 {
|
||||||
|
vals, _ := k.parseUint64s(k.Strings(delim), true, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// TimesFormat parses with given format and returns list of time.Time divided by given delimiter.
|
||||||
|
// Any invalid input will be treated as zero value (0001-01-01 00:00:00 +0000 UTC).
|
||||||
|
func (k *Key) TimesFormat(format, delim string) []time.Time {
|
||||||
|
vals, _ := k.parseTimesFormat(format, k.Strings(delim), true, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// Times parses with RFC3339 format and returns list of time.Time divided by given delimiter.
|
||||||
|
// Any invalid input will be treated as zero value (0001-01-01 00:00:00 +0000 UTC).
|
||||||
|
func (k *Key) Times(delim string) []time.Time {
|
||||||
|
return k.TimesFormat(time.RFC3339, delim)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValidFloat64s returns list of float64 divided by given delimiter. If some value is not float, then
|
||||||
|
// it will not be included to result list.
|
||||||
|
func (k *Key) ValidFloat64s(delim string) []float64 {
|
||||||
|
vals, _ := k.parseFloat64s(k.Strings(delim), false, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValidInts returns list of int divided by given delimiter. If some value is not integer, then it will
|
||||||
|
// not be included to result list.
|
||||||
|
func (k *Key) ValidInts(delim string) []int {
|
||||||
|
vals, _ := k.parseInts(k.Strings(delim), false, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValidInt64s returns list of int64 divided by given delimiter. If some value is not 64-bit integer,
|
||||||
|
// then it will not be included to result list.
|
||||||
|
func (k *Key) ValidInt64s(delim string) []int64 {
|
||||||
|
vals, _ := k.parseInt64s(k.Strings(delim), false, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValidUints returns list of uint divided by given delimiter. If some value is not unsigned integer,
|
||||||
|
// then it will not be included to result list.
|
||||||
|
func (k *Key) ValidUints(delim string) []uint {
|
||||||
|
vals, _ := k.parseUints(k.Strings(delim), false, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValidUint64s returns list of uint64 divided by given delimiter. If some value is not 64-bit unsigned
|
||||||
|
// integer, then it will not be included to result list.
|
||||||
|
func (k *Key) ValidUint64s(delim string) []uint64 {
|
||||||
|
vals, _ := k.parseUint64s(k.Strings(delim), false, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValidTimesFormat parses with given format and returns list of time.Time divided by given delimiter.
|
||||||
|
func (k *Key) ValidTimesFormat(format, delim string) []time.Time {
|
||||||
|
vals, _ := k.parseTimesFormat(format, k.Strings(delim), false, false)
|
||||||
|
return vals
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValidTimes parses with RFC3339 format and returns list of time.Time divided by given delimiter.
|
||||||
|
func (k *Key) ValidTimes(delim string) []time.Time {
|
||||||
|
return k.ValidTimesFormat(time.RFC3339, delim)
|
||||||
|
}
|
||||||
|
|
||||||
|
// StrictFloat64s returns list of float64 divided by given delimiter or error on first invalid input.
|
||||||
|
func (k *Key) StrictFloat64s(delim string) ([]float64, error) {
|
||||||
|
return k.parseFloat64s(k.Strings(delim), false, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// StrictInts returns list of int divided by given delimiter or error on first invalid input.
|
||||||
|
func (k *Key) StrictInts(delim string) ([]int, error) {
|
||||||
|
return k.parseInts(k.Strings(delim), false, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// StrictInt64s returns list of int64 divided by given delimiter or error on first invalid input.
|
||||||
|
func (k *Key) StrictInt64s(delim string) ([]int64, error) {
|
||||||
|
return k.parseInt64s(k.Strings(delim), false, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// StrictUints returns list of uint divided by given delimiter or error on first invalid input.
|
||||||
|
func (k *Key) StrictUints(delim string) ([]uint, error) {
|
||||||
|
return k.parseUints(k.Strings(delim), false, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// StrictUint64s returns list of uint64 divided by given delimiter or error on first invalid input.
|
||||||
|
func (k *Key) StrictUint64s(delim string) ([]uint64, error) {
|
||||||
|
return k.parseUint64s(k.Strings(delim), false, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// StrictTimesFormat parses with given format and returns list of time.Time divided by given delimiter
|
||||||
|
// or error on first invalid input.
|
||||||
|
func (k *Key) StrictTimesFormat(format, delim string) ([]time.Time, error) {
|
||||||
|
return k.parseTimesFormat(format, k.Strings(delim), false, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// StrictTimes parses with RFC3339 format and returns list of time.Time divided by given delimiter
|
||||||
|
// or error on first invalid input.
|
||||||
|
func (k *Key) StrictTimes(delim string) ([]time.Time, error) {
|
||||||
|
return k.StrictTimesFormat(time.RFC3339, delim)
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseFloat64s transforms strings to float64s.
|
||||||
|
func (k *Key) parseFloat64s(strs []string, addInvalid, returnOnInvalid bool) ([]float64, error) {
|
||||||
|
vals := make([]float64, 0, len(strs))
|
||||||
|
for _, str := range strs {
|
||||||
|
val, err := strconv.ParseFloat(str, 64)
|
||||||
|
if err != nil && returnOnInvalid {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err == nil || addInvalid {
|
||||||
|
vals = append(vals, val)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return vals, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseInts transforms strings to ints.
|
||||||
|
func (k *Key) parseInts(strs []string, addInvalid, returnOnInvalid bool) ([]int, error) {
|
||||||
|
vals := make([]int, 0, len(strs))
|
||||||
|
for _, str := range strs {
|
||||||
|
val, err := strconv.Atoi(str)
|
||||||
|
if err != nil && returnOnInvalid {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err == nil || addInvalid {
|
||||||
|
vals = append(vals, val)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return vals, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseInt64s transforms strings to int64s.
|
||||||
|
func (k *Key) parseInt64s(strs []string, addInvalid, returnOnInvalid bool) ([]int64, error) {
|
||||||
|
vals := make([]int64, 0, len(strs))
|
||||||
|
for _, str := range strs {
|
||||||
|
val, err := strconv.ParseInt(str, 10, 64)
|
||||||
|
if err != nil && returnOnInvalid {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err == nil || addInvalid {
|
||||||
|
vals = append(vals, val)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return vals, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseUints transforms strings to uints.
|
||||||
|
func (k *Key) parseUints(strs []string, addInvalid, returnOnInvalid bool) ([]uint, error) {
|
||||||
|
vals := make([]uint, 0, len(strs))
|
||||||
|
for _, str := range strs {
|
||||||
|
val, err := strconv.ParseUint(str, 10, 0)
|
||||||
|
if err != nil && returnOnInvalid {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err == nil || addInvalid {
|
||||||
|
vals = append(vals, uint(val))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return vals, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseUint64s transforms strings to uint64s.
|
||||||
|
func (k *Key) parseUint64s(strs []string, addInvalid, returnOnInvalid bool) ([]uint64, error) {
|
||||||
|
vals := make([]uint64, 0, len(strs))
|
||||||
|
for _, str := range strs {
|
||||||
|
val, err := strconv.ParseUint(str, 10, 64)
|
||||||
|
if err != nil && returnOnInvalid {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err == nil || addInvalid {
|
||||||
|
vals = append(vals, val)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return vals, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseTimesFormat transforms strings to times in given format.
|
||||||
|
func (k *Key) parseTimesFormat(format string, strs []string, addInvalid, returnOnInvalid bool) ([]time.Time, error) {
|
||||||
|
vals := make([]time.Time, 0, len(strs))
|
||||||
|
for _, str := range strs {
|
||||||
|
val, err := time.Parse(format, str)
|
||||||
|
if err != nil && returnOnInvalid {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err == nil || addInvalid {
|
||||||
|
vals = append(vals, val)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return vals, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetValue changes key value.
|
||||||
|
func (k *Key) SetValue(v string) {
|
||||||
|
if k.s.f.BlockMode {
|
||||||
|
k.s.f.lock.Lock()
|
||||||
|
defer k.s.f.lock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
k.value = v
|
||||||
|
k.s.keysHash[k.name] = v
|
||||||
|
}
|
573
vendor/src/github.com/go-ini/ini/key_test.go
vendored
Normal file
573
vendor/src/github.com/go-ini/ini/key_test.go
vendored
Normal file
|
@ -0,0 +1,573 @@
|
||||||
|
// Copyright 2014 Unknwon
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||||
|
// not use this file except in compliance with the License. You may obtain
|
||||||
|
// a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
// License for the specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
package ini
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
. "github.com/smartystreets/goconvey/convey"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Test_Key(t *testing.T) {
|
||||||
|
Convey("Test getting and setting values", t, func() {
|
||||||
|
cfg, err := Load([]byte(_CONF_DATA), "testdata/conf.ini")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
Convey("Get values in default section", func() {
|
||||||
|
sec := cfg.Section("")
|
||||||
|
So(sec, ShouldNotBeNil)
|
||||||
|
So(sec.Key("NAME").Value(), ShouldEqual, "ini")
|
||||||
|
So(sec.Key("NAME").String(), ShouldEqual, "ini")
|
||||||
|
So(sec.Key("NAME").Validate(func(in string) string {
|
||||||
|
return in
|
||||||
|
}), ShouldEqual, "ini")
|
||||||
|
So(sec.Key("NAME").Comment, ShouldEqual, "; Package name")
|
||||||
|
So(sec.Key("IMPORT_PATH").String(), ShouldEqual, "gopkg.in/ini.v1")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get values in non-default section", func() {
|
||||||
|
sec := cfg.Section("author")
|
||||||
|
So(sec, ShouldNotBeNil)
|
||||||
|
So(sec.Key("NAME").String(), ShouldEqual, "Unknwon")
|
||||||
|
So(sec.Key("GITHUB").String(), ShouldEqual, "https://github.com/Unknwon")
|
||||||
|
|
||||||
|
sec = cfg.Section("package")
|
||||||
|
So(sec, ShouldNotBeNil)
|
||||||
|
So(sec.Key("CLONE_URL").String(), ShouldEqual, "https://gopkg.in/ini.v1")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get auto-increment key names", func() {
|
||||||
|
keys := cfg.Section("features").Keys()
|
||||||
|
for i, k := range keys {
|
||||||
|
So(k.Name(), ShouldEqual, fmt.Sprintf("#%d", i+1))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get parent-keys that are available to the child section", func() {
|
||||||
|
parentKeys := cfg.Section("package.sub").ParentKeys()
|
||||||
|
for _, k := range parentKeys {
|
||||||
|
So(k.Name(), ShouldEqual, "CLONE_URL")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get overwrite value", func() {
|
||||||
|
So(cfg.Section("author").Key("E-MAIL").String(), ShouldEqual, "u@gogs.io")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get sections", func() {
|
||||||
|
sections := cfg.Sections()
|
||||||
|
for i, name := range []string{DEFAULT_SECTION, "author", "package", "package.sub", "features", "types", "array", "note", "comments", "advance"} {
|
||||||
|
So(sections[i].Name(), ShouldEqual, name)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get parent section value", func() {
|
||||||
|
So(cfg.Section("package.sub").Key("CLONE_URL").String(), ShouldEqual, "https://gopkg.in/ini.v1")
|
||||||
|
So(cfg.Section("package.fake.sub").Key("CLONE_URL").String(), ShouldEqual, "https://gopkg.in/ini.v1")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get multiple line value", func() {
|
||||||
|
So(cfg.Section("author").Key("BIO").String(), ShouldEqual, "Gopher.\nCoding addict.\nGood man.\n")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get values with type", func() {
|
||||||
|
sec := cfg.Section("types")
|
||||||
|
v1, err := sec.Key("BOOL").Bool()
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(v1, ShouldBeTrue)
|
||||||
|
|
||||||
|
v1, err = sec.Key("BOOL_FALSE").Bool()
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(v1, ShouldBeFalse)
|
||||||
|
|
||||||
|
v2, err := sec.Key("FLOAT64").Float64()
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(v2, ShouldEqual, 1.25)
|
||||||
|
|
||||||
|
v3, err := sec.Key("INT").Int()
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(v3, ShouldEqual, 10)
|
||||||
|
|
||||||
|
v4, err := sec.Key("INT").Int64()
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(v4, ShouldEqual, 10)
|
||||||
|
|
||||||
|
v5, err := sec.Key("UINT").Uint()
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(v5, ShouldEqual, 3)
|
||||||
|
|
||||||
|
v6, err := sec.Key("UINT").Uint64()
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(v6, ShouldEqual, 3)
|
||||||
|
|
||||||
|
t, err := time.Parse(time.RFC3339, "2015-01-01T20:17:05Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
v7, err := sec.Key("TIME").Time()
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(v7.String(), ShouldEqual, t.String())
|
||||||
|
|
||||||
|
Convey("Must get values with type", func() {
|
||||||
|
So(sec.Key("STRING").MustString("404"), ShouldEqual, "str")
|
||||||
|
So(sec.Key("BOOL").MustBool(), ShouldBeTrue)
|
||||||
|
So(sec.Key("FLOAT64").MustFloat64(), ShouldEqual, 1.25)
|
||||||
|
So(sec.Key("INT").MustInt(), ShouldEqual, 10)
|
||||||
|
So(sec.Key("INT").MustInt64(), ShouldEqual, 10)
|
||||||
|
So(sec.Key("UINT").MustUint(), ShouldEqual, 3)
|
||||||
|
So(sec.Key("UINT").MustUint64(), ShouldEqual, 3)
|
||||||
|
So(sec.Key("TIME").MustTime().String(), ShouldEqual, t.String())
|
||||||
|
|
||||||
|
dur, err := time.ParseDuration("2h45m")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(sec.Key("DURATION").MustDuration().Seconds(), ShouldEqual, dur.Seconds())
|
||||||
|
|
||||||
|
Convey("Must get values with default value", func() {
|
||||||
|
So(sec.Key("STRING_404").MustString("404"), ShouldEqual, "404")
|
||||||
|
So(sec.Key("BOOL_404").MustBool(true), ShouldBeTrue)
|
||||||
|
So(sec.Key("FLOAT64_404").MustFloat64(2.5), ShouldEqual, 2.5)
|
||||||
|
So(sec.Key("INT_404").MustInt(15), ShouldEqual, 15)
|
||||||
|
So(sec.Key("INT64_404").MustInt64(15), ShouldEqual, 15)
|
||||||
|
So(sec.Key("UINT_404").MustUint(6), ShouldEqual, 6)
|
||||||
|
So(sec.Key("UINT64_404").MustUint64(6), ShouldEqual, 6)
|
||||||
|
|
||||||
|
t, err := time.Parse(time.RFC3339, "2014-01-01T20:17:05Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(sec.Key("TIME_404").MustTime(t).String(), ShouldEqual, t.String())
|
||||||
|
|
||||||
|
So(sec.Key("DURATION_404").MustDuration(dur).Seconds(), ShouldEqual, dur.Seconds())
|
||||||
|
|
||||||
|
Convey("Must should set default as key value", func() {
|
||||||
|
So(sec.Key("STRING_404").String(), ShouldEqual, "404")
|
||||||
|
So(sec.Key("BOOL_404").String(), ShouldEqual, "true")
|
||||||
|
So(sec.Key("FLOAT64_404").String(), ShouldEqual, "2.5")
|
||||||
|
So(sec.Key("INT_404").String(), ShouldEqual, "15")
|
||||||
|
So(sec.Key("INT64_404").String(), ShouldEqual, "15")
|
||||||
|
So(sec.Key("UINT_404").String(), ShouldEqual, "6")
|
||||||
|
So(sec.Key("UINT64_404").String(), ShouldEqual, "6")
|
||||||
|
So(sec.Key("TIME_404").String(), ShouldEqual, "2014-01-01T20:17:05Z")
|
||||||
|
So(sec.Key("DURATION_404").String(), ShouldEqual, "2h45m0s")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get value with candidates", func() {
|
||||||
|
sec := cfg.Section("types")
|
||||||
|
So(sec.Key("STRING").In("", []string{"str", "arr", "types"}), ShouldEqual, "str")
|
||||||
|
So(sec.Key("FLOAT64").InFloat64(0, []float64{1.25, 2.5, 3.75}), ShouldEqual, 1.25)
|
||||||
|
So(sec.Key("INT").InInt(0, []int{10, 20, 30}), ShouldEqual, 10)
|
||||||
|
So(sec.Key("INT").InInt64(0, []int64{10, 20, 30}), ShouldEqual, 10)
|
||||||
|
So(sec.Key("UINT").InUint(0, []uint{3, 6, 9}), ShouldEqual, 3)
|
||||||
|
So(sec.Key("UINT").InUint64(0, []uint64{3, 6, 9}), ShouldEqual, 3)
|
||||||
|
|
||||||
|
zt, err := time.Parse(time.RFC3339, "0001-01-01T01:00:00Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
t, err := time.Parse(time.RFC3339, "2015-01-01T20:17:05Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(sec.Key("TIME").InTime(zt, []time.Time{t, time.Now(), time.Now().Add(1 * time.Second)}).String(), ShouldEqual, t.String())
|
||||||
|
|
||||||
|
Convey("Get value with candidates and default value", func() {
|
||||||
|
So(sec.Key("STRING_404").In("str", []string{"str", "arr", "types"}), ShouldEqual, "str")
|
||||||
|
So(sec.Key("FLOAT64_404").InFloat64(1.25, []float64{1.25, 2.5, 3.75}), ShouldEqual, 1.25)
|
||||||
|
So(sec.Key("INT_404").InInt(10, []int{10, 20, 30}), ShouldEqual, 10)
|
||||||
|
So(sec.Key("INT64_404").InInt64(10, []int64{10, 20, 30}), ShouldEqual, 10)
|
||||||
|
So(sec.Key("UINT_404").InUint(3, []uint{3, 6, 9}), ShouldEqual, 3)
|
||||||
|
So(sec.Key("UINT_404").InUint64(3, []uint64{3, 6, 9}), ShouldEqual, 3)
|
||||||
|
So(sec.Key("TIME_404").InTime(t, []time.Time{time.Now(), time.Now(), time.Now().Add(1 * time.Second)}).String(), ShouldEqual, t.String())
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get values in range", func() {
|
||||||
|
sec := cfg.Section("types")
|
||||||
|
So(sec.Key("FLOAT64").RangeFloat64(0, 1, 2), ShouldEqual, 1.25)
|
||||||
|
So(sec.Key("INT").RangeInt(0, 10, 20), ShouldEqual, 10)
|
||||||
|
So(sec.Key("INT").RangeInt64(0, 10, 20), ShouldEqual, 10)
|
||||||
|
|
||||||
|
minT, err := time.Parse(time.RFC3339, "0001-01-01T01:00:00Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
midT, err := time.Parse(time.RFC3339, "2013-01-01T01:00:00Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
maxT, err := time.Parse(time.RFC3339, "9999-01-01T01:00:00Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
t, err := time.Parse(time.RFC3339, "2015-01-01T20:17:05Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(sec.Key("TIME").RangeTime(t, minT, maxT).String(), ShouldEqual, t.String())
|
||||||
|
|
||||||
|
Convey("Get value in range with default value", func() {
|
||||||
|
So(sec.Key("FLOAT64").RangeFloat64(5, 0, 1), ShouldEqual, 5)
|
||||||
|
So(sec.Key("INT").RangeInt(7, 0, 5), ShouldEqual, 7)
|
||||||
|
So(sec.Key("INT").RangeInt64(7, 0, 5), ShouldEqual, 7)
|
||||||
|
So(sec.Key("TIME").RangeTime(t, minT, midT).String(), ShouldEqual, t.String())
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get values into slice", func() {
|
||||||
|
sec := cfg.Section("array")
|
||||||
|
So(strings.Join(sec.Key("STRINGS").Strings(","), ","), ShouldEqual, "en,zh,de")
|
||||||
|
So(len(sec.Key("STRINGS_404").Strings(",")), ShouldEqual, 0)
|
||||||
|
|
||||||
|
vals1 := sec.Key("FLOAT64S").Float64s(",")
|
||||||
|
float64sEqual(vals1, 1.1, 2.2, 3.3)
|
||||||
|
|
||||||
|
vals2 := sec.Key("INTS").Ints(",")
|
||||||
|
intsEqual(vals2, 1, 2, 3)
|
||||||
|
|
||||||
|
vals3 := sec.Key("INTS").Int64s(",")
|
||||||
|
int64sEqual(vals3, 1, 2, 3)
|
||||||
|
|
||||||
|
vals4 := sec.Key("UINTS").Uints(",")
|
||||||
|
uintsEqual(vals4, 1, 2, 3)
|
||||||
|
|
||||||
|
vals5 := sec.Key("UINTS").Uint64s(",")
|
||||||
|
uint64sEqual(vals5, 1, 2, 3)
|
||||||
|
|
||||||
|
t, err := time.Parse(time.RFC3339, "2015-01-01T20:17:05Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
vals6 := sec.Key("TIMES").Times(",")
|
||||||
|
timesEqual(vals6, t, t, t)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get valid values into slice", func() {
|
||||||
|
sec := cfg.Section("array")
|
||||||
|
vals1 := sec.Key("FLOAT64S").ValidFloat64s(",")
|
||||||
|
float64sEqual(vals1, 1.1, 2.2, 3.3)
|
||||||
|
|
||||||
|
vals2 := sec.Key("INTS").ValidInts(",")
|
||||||
|
intsEqual(vals2, 1, 2, 3)
|
||||||
|
|
||||||
|
vals3 := sec.Key("INTS").ValidInt64s(",")
|
||||||
|
int64sEqual(vals3, 1, 2, 3)
|
||||||
|
|
||||||
|
vals4 := sec.Key("UINTS").ValidUints(",")
|
||||||
|
uintsEqual(vals4, 1, 2, 3)
|
||||||
|
|
||||||
|
vals5 := sec.Key("UINTS").ValidUint64s(",")
|
||||||
|
uint64sEqual(vals5, 1, 2, 3)
|
||||||
|
|
||||||
|
t, err := time.Parse(time.RFC3339, "2015-01-01T20:17:05Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
vals6 := sec.Key("TIMES").ValidTimes(",")
|
||||||
|
timesEqual(vals6, t, t, t)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get values one type into slice of another type", func() {
|
||||||
|
sec := cfg.Section("array")
|
||||||
|
vals1 := sec.Key("STRINGS").ValidFloat64s(",")
|
||||||
|
So(vals1, ShouldBeEmpty)
|
||||||
|
|
||||||
|
vals2 := sec.Key("STRINGS").ValidInts(",")
|
||||||
|
So(vals2, ShouldBeEmpty)
|
||||||
|
|
||||||
|
vals3 := sec.Key("STRINGS").ValidInt64s(",")
|
||||||
|
So(vals3, ShouldBeEmpty)
|
||||||
|
|
||||||
|
vals4 := sec.Key("STRINGS").ValidUints(",")
|
||||||
|
So(vals4, ShouldBeEmpty)
|
||||||
|
|
||||||
|
vals5 := sec.Key("STRINGS").ValidUint64s(",")
|
||||||
|
So(vals5, ShouldBeEmpty)
|
||||||
|
|
||||||
|
vals6 := sec.Key("STRINGS").ValidTimes(",")
|
||||||
|
So(vals6, ShouldBeEmpty)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get valid values into slice without errors", func() {
|
||||||
|
sec := cfg.Section("array")
|
||||||
|
vals1, err := sec.Key("FLOAT64S").StrictFloat64s(",")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
float64sEqual(vals1, 1.1, 2.2, 3.3)
|
||||||
|
|
||||||
|
vals2, err := sec.Key("INTS").StrictInts(",")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
intsEqual(vals2, 1, 2, 3)
|
||||||
|
|
||||||
|
vals3, err := sec.Key("INTS").StrictInt64s(",")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
int64sEqual(vals3, 1, 2, 3)
|
||||||
|
|
||||||
|
vals4, err := sec.Key("UINTS").StrictUints(",")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
uintsEqual(vals4, 1, 2, 3)
|
||||||
|
|
||||||
|
vals5, err := sec.Key("UINTS").StrictUint64s(",")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
uint64sEqual(vals5, 1, 2, 3)
|
||||||
|
|
||||||
|
t, err := time.Parse(time.RFC3339, "2015-01-01T20:17:05Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
vals6, err := sec.Key("TIMES").StrictTimes(",")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
timesEqual(vals6, t, t, t)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get invalid values into slice", func() {
|
||||||
|
sec := cfg.Section("array")
|
||||||
|
vals1, err := sec.Key("STRINGS").StrictFloat64s(",")
|
||||||
|
So(vals1, ShouldBeEmpty)
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
vals2, err := sec.Key("STRINGS").StrictInts(",")
|
||||||
|
So(vals2, ShouldBeEmpty)
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
vals3, err := sec.Key("STRINGS").StrictInt64s(",")
|
||||||
|
So(vals3, ShouldBeEmpty)
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
vals4, err := sec.Key("STRINGS").StrictUints(",")
|
||||||
|
So(vals4, ShouldBeEmpty)
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
vals5, err := sec.Key("STRINGS").StrictUint64s(",")
|
||||||
|
So(vals5, ShouldBeEmpty)
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
|
||||||
|
vals6, err := sec.Key("STRINGS").StrictTimes(",")
|
||||||
|
So(vals6, ShouldBeEmpty)
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get key hash", func() {
|
||||||
|
cfg.Section("").KeysHash()
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Set key value", func() {
|
||||||
|
k := cfg.Section("author").Key("NAME")
|
||||||
|
k.SetValue("无闻")
|
||||||
|
So(k.String(), ShouldEqual, "无闻")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get key strings", func() {
|
||||||
|
So(strings.Join(cfg.Section("types").KeyStrings(), ","), ShouldEqual, "STRING,BOOL,BOOL_FALSE,FLOAT64,INT,TIME,DURATION,UINT")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Delete a key", func() {
|
||||||
|
cfg.Section("package.sub").DeleteKey("UNUSED_KEY")
|
||||||
|
_, err := cfg.Section("package.sub").GetKey("UNUSED_KEY")
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Has Key (backwards compatible)", func() {
|
||||||
|
sec := cfg.Section("package.sub")
|
||||||
|
haskey1 := sec.Haskey("UNUSED_KEY")
|
||||||
|
haskey2 := sec.Haskey("CLONE_URL")
|
||||||
|
haskey3 := sec.Haskey("CLONE_URL_NO")
|
||||||
|
So(haskey1, ShouldBeTrue)
|
||||||
|
So(haskey2, ShouldBeTrue)
|
||||||
|
So(haskey3, ShouldBeFalse)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Has Key", func() {
|
||||||
|
sec := cfg.Section("package.sub")
|
||||||
|
haskey1 := sec.HasKey("UNUSED_KEY")
|
||||||
|
haskey2 := sec.HasKey("CLONE_URL")
|
||||||
|
haskey3 := sec.HasKey("CLONE_URL_NO")
|
||||||
|
So(haskey1, ShouldBeTrue)
|
||||||
|
So(haskey2, ShouldBeTrue)
|
||||||
|
So(haskey3, ShouldBeFalse)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Has Value", func() {
|
||||||
|
sec := cfg.Section("author")
|
||||||
|
hasvalue1 := sec.HasValue("Unknwon")
|
||||||
|
hasvalue2 := sec.HasValue("doc")
|
||||||
|
So(hasvalue1, ShouldBeTrue)
|
||||||
|
So(hasvalue2, ShouldBeFalse)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Test getting and setting bad values", t, func() {
|
||||||
|
cfg, err := Load([]byte(_CONF_DATA), "testdata/conf.ini")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
Convey("Create new key with empty name", func() {
|
||||||
|
k, err := cfg.Section("").NewKey("", "")
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
So(k, ShouldBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Create new section with empty name", func() {
|
||||||
|
s, err := cfg.NewSection("")
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
So(s, ShouldBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Create new sections with empty name", func() {
|
||||||
|
So(cfg.NewSections(""), ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Get section that not exists", func() {
|
||||||
|
s, err := cfg.GetSection("404")
|
||||||
|
So(err, ShouldNotBeNil)
|
||||||
|
So(s, ShouldBeNil)
|
||||||
|
|
||||||
|
s = cfg.Section("404")
|
||||||
|
So(s, ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Test key hash clone", t, func() {
|
||||||
|
cfg, err := Load([]byte(strings.Replace("network=tcp,addr=127.0.0.1:6379,db=4,pool_size=100,idle_timeout=180", ",", "\n", -1)))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
for _, v := range cfg.Section("").KeysHash() {
|
||||||
|
So(len(v), ShouldBeGreaterThan, 0)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Key has empty value", t, func() {
|
||||||
|
_conf := `key1=
|
||||||
|
key2= ; comment`
|
||||||
|
cfg, err := Load([]byte(_conf))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg.Section("").Key("key1").Value(), ShouldBeEmpty)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const _CONF_GIT_CONFIG = `
|
||||||
|
[remote "origin"]
|
||||||
|
url = https://github.com/Antergone/test1.git
|
||||||
|
url = https://github.com/Antergone/test2.git
|
||||||
|
`
|
||||||
|
|
||||||
|
func Test_Key_Shadows(t *testing.T) {
|
||||||
|
Convey("Shadows keys", t, func() {
|
||||||
|
Convey("Disable shadows", func() {
|
||||||
|
cfg, err := Load([]byte(_CONF_GIT_CONFIG))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg.Section(`remote "origin"`).Key("url").String(), ShouldEqual, "https://github.com/Antergone/test2.git")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Enable shadows", func() {
|
||||||
|
cfg, err := ShadowLoad([]byte(_CONF_GIT_CONFIG))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg.Section(`remote "origin"`).Key("url").String(), ShouldEqual, "https://github.com/Antergone/test1.git")
|
||||||
|
So(strings.Join(cfg.Section(`remote "origin"`).Key("url").ValueWithShadows(), " "), ShouldEqual,
|
||||||
|
"https://github.com/Antergone/test1.git https://github.com/Antergone/test2.git")
|
||||||
|
|
||||||
|
Convey("Save with shadows", func() {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
_, err := cfg.WriteTo(&buf)
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(buf.String(), ShouldEqual, `[remote "origin"]
|
||||||
|
url = https://github.com/Antergone/test1.git
|
||||||
|
url = https://github.com/Antergone/test2.git
|
||||||
|
|
||||||
|
`)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func newTestFile(block bool) *File {
|
||||||
|
c, _ := Load([]byte(_CONF_DATA))
|
||||||
|
c.BlockMode = block
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_Value(b *testing.B) {
|
||||||
|
c := newTestFile(true)
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
c.Section("").Key("NAME").Value()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_Value_NonBlock(b *testing.B) {
|
||||||
|
c := newTestFile(false)
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
c.Section("").Key("NAME").Value()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_Value_ViaSection(b *testing.B) {
|
||||||
|
c := newTestFile(true)
|
||||||
|
sec := c.Section("")
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
sec.Key("NAME").Value()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_Value_ViaSection_NonBlock(b *testing.B) {
|
||||||
|
c := newTestFile(false)
|
||||||
|
sec := c.Section("")
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
sec.Key("NAME").Value()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_Value_Direct(b *testing.B) {
|
||||||
|
c := newTestFile(true)
|
||||||
|
key := c.Section("").Key("NAME")
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
key.Value()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_Value_Direct_NonBlock(b *testing.B) {
|
||||||
|
c := newTestFile(false)
|
||||||
|
key := c.Section("").Key("NAME")
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
key.Value()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_String(b *testing.B) {
|
||||||
|
c := newTestFile(true)
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
_ = c.Section("").Key("NAME").String()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_String_NonBlock(b *testing.B) {
|
||||||
|
c := newTestFile(false)
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
_ = c.Section("").Key("NAME").String()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_String_ViaSection(b *testing.B) {
|
||||||
|
c := newTestFile(true)
|
||||||
|
sec := c.Section("")
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
_ = sec.Key("NAME").String()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_String_ViaSection_NonBlock(b *testing.B) {
|
||||||
|
c := newTestFile(false)
|
||||||
|
sec := c.Section("")
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
_ = sec.Key("NAME").String()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_SetValue(b *testing.B) {
|
||||||
|
c := newTestFile(true)
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
c.Section("").Key("NAME").SetValue("10")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Key_SetValue_VisSection(b *testing.B) {
|
||||||
|
c := newTestFile(true)
|
||||||
|
sec := c.Section("")
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
sec.Key("NAME").SetValue("10")
|
||||||
|
}
|
||||||
|
}
|
361
vendor/src/github.com/go-ini/ini/parser.go
vendored
Normal file
361
vendor/src/github.com/go-ini/ini/parser.go
vendored
Normal file
|
@ -0,0 +1,361 @@
|
||||||
|
// Copyright 2015 Unknwon
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||||
|
// not use this file except in compliance with the License. You may obtain
|
||||||
|
// a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
// License for the specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
package ini
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"unicode"
|
||||||
|
)
|
||||||
|
|
||||||
|
type tokenType int
|
||||||
|
|
||||||
|
const (
|
||||||
|
_TOKEN_INVALID tokenType = iota
|
||||||
|
_TOKEN_COMMENT
|
||||||
|
_TOKEN_SECTION
|
||||||
|
_TOKEN_KEY
|
||||||
|
)
|
||||||
|
|
||||||
|
type parser struct {
|
||||||
|
buf *bufio.Reader
|
||||||
|
isEOF bool
|
||||||
|
count int
|
||||||
|
comment *bytes.Buffer
|
||||||
|
}
|
||||||
|
|
||||||
|
func newParser(r io.Reader) *parser {
|
||||||
|
return &parser{
|
||||||
|
buf: bufio.NewReader(r),
|
||||||
|
count: 1,
|
||||||
|
comment: &bytes.Buffer{},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// BOM handles header of UTF-8, UTF-16 LE and UTF-16 BE's BOM format.
|
||||||
|
// http://en.wikipedia.org/wiki/Byte_order_mark#Representations_of_byte_order_marks_by_encoding
|
||||||
|
func (p *parser) BOM() error {
|
||||||
|
mask, err := p.buf.Peek(2)
|
||||||
|
if err != nil && err != io.EOF {
|
||||||
|
return err
|
||||||
|
} else if len(mask) < 2 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
switch {
|
||||||
|
case mask[0] == 254 && mask[1] == 255:
|
||||||
|
fallthrough
|
||||||
|
case mask[0] == 255 && mask[1] == 254:
|
||||||
|
p.buf.Read(mask)
|
||||||
|
case mask[0] == 239 && mask[1] == 187:
|
||||||
|
mask, err := p.buf.Peek(3)
|
||||||
|
if err != nil && err != io.EOF {
|
||||||
|
return err
|
||||||
|
} else if len(mask) < 3 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if mask[2] == 191 {
|
||||||
|
p.buf.Read(mask)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *parser) readUntil(delim byte) ([]byte, error) {
|
||||||
|
data, err := p.buf.ReadBytes(delim)
|
||||||
|
if err != nil {
|
||||||
|
if err == io.EOF {
|
||||||
|
p.isEOF = true
|
||||||
|
} else {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return data, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func cleanComment(in []byte) ([]byte, bool) {
|
||||||
|
i := bytes.IndexAny(in, "#;")
|
||||||
|
if i == -1 {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
return in[i:], true
|
||||||
|
}
|
||||||
|
|
||||||
|
func readKeyName(in []byte) (string, int, error) {
|
||||||
|
line := string(in)
|
||||||
|
|
||||||
|
// Check if key name surrounded by quotes.
|
||||||
|
var keyQuote string
|
||||||
|
if line[0] == '"' {
|
||||||
|
if len(line) > 6 && string(line[0:3]) == `"""` {
|
||||||
|
keyQuote = `"""`
|
||||||
|
} else {
|
||||||
|
keyQuote = `"`
|
||||||
|
}
|
||||||
|
} else if line[0] == '`' {
|
||||||
|
keyQuote = "`"
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get out key name
|
||||||
|
endIdx := -1
|
||||||
|
if len(keyQuote) > 0 {
|
||||||
|
startIdx := len(keyQuote)
|
||||||
|
// FIXME: fail case -> """"""name"""=value
|
||||||
|
pos := strings.Index(line[startIdx:], keyQuote)
|
||||||
|
if pos == -1 {
|
||||||
|
return "", -1, fmt.Errorf("missing closing key quote: %s", line)
|
||||||
|
}
|
||||||
|
pos += startIdx
|
||||||
|
|
||||||
|
// Find key-value delimiter
|
||||||
|
i := strings.IndexAny(line[pos+startIdx:], "=:")
|
||||||
|
if i < 0 {
|
||||||
|
return "", -1, ErrDelimiterNotFound{line}
|
||||||
|
}
|
||||||
|
endIdx = pos + i
|
||||||
|
return strings.TrimSpace(line[startIdx:pos]), endIdx + startIdx + 1, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
endIdx = strings.IndexAny(line, "=:")
|
||||||
|
if endIdx < 0 {
|
||||||
|
return "", -1, ErrDelimiterNotFound{line}
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(line[0:endIdx]), endIdx + 1, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *parser) readMultilines(line, val, valQuote string) (string, error) {
|
||||||
|
for {
|
||||||
|
data, err := p.readUntil('\n')
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
next := string(data)
|
||||||
|
|
||||||
|
pos := strings.LastIndex(next, valQuote)
|
||||||
|
if pos > -1 {
|
||||||
|
val += next[:pos]
|
||||||
|
|
||||||
|
comment, has := cleanComment([]byte(next[pos:]))
|
||||||
|
if has {
|
||||||
|
p.comment.Write(bytes.TrimSpace(comment))
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
val += next
|
||||||
|
if p.isEOF {
|
||||||
|
return "", fmt.Errorf("missing closing key quote from '%s' to '%s'", line, next)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return val, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *parser) readContinuationLines(val string) (string, error) {
|
||||||
|
for {
|
||||||
|
data, err := p.readUntil('\n')
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
next := strings.TrimSpace(string(data))
|
||||||
|
|
||||||
|
if len(next) == 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
val += next
|
||||||
|
if val[len(val)-1] != '\\' {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
val = val[:len(val)-1]
|
||||||
|
}
|
||||||
|
return val, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// hasSurroundedQuote check if and only if the first and last characters
|
||||||
|
// are quotes \" or \'.
|
||||||
|
// It returns false if any other parts also contain same kind of quotes.
|
||||||
|
func hasSurroundedQuote(in string, quote byte) bool {
|
||||||
|
return len(in) > 2 && in[0] == quote && in[len(in)-1] == quote &&
|
||||||
|
strings.IndexByte(in[1:], quote) == len(in)-2
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *parser) readValue(in []byte, ignoreContinuation, ignoreInlineComment bool) (string, error) {
|
||||||
|
line := strings.TrimLeftFunc(string(in), unicode.IsSpace)
|
||||||
|
if len(line) == 0 {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var valQuote string
|
||||||
|
if len(line) > 3 && string(line[0:3]) == `"""` {
|
||||||
|
valQuote = `"""`
|
||||||
|
} else if line[0] == '`' {
|
||||||
|
valQuote = "`"
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(valQuote) > 0 {
|
||||||
|
startIdx := len(valQuote)
|
||||||
|
pos := strings.LastIndex(line[startIdx:], valQuote)
|
||||||
|
// Check for multi-line value
|
||||||
|
if pos == -1 {
|
||||||
|
return p.readMultilines(line, line[startIdx:], valQuote)
|
||||||
|
}
|
||||||
|
|
||||||
|
return line[startIdx : pos+startIdx], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Won't be able to reach here if value only contains whitespace
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
|
||||||
|
// Check continuation lines when desired
|
||||||
|
if !ignoreContinuation && line[len(line)-1] == '\\' {
|
||||||
|
return p.readContinuationLines(line[:len(line)-1])
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if ignore inline comment
|
||||||
|
if !ignoreInlineComment {
|
||||||
|
i := strings.IndexAny(line, "#;")
|
||||||
|
if i > -1 {
|
||||||
|
p.comment.WriteString(line[i:])
|
||||||
|
line = strings.TrimSpace(line[:i])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Trim single quotes
|
||||||
|
if hasSurroundedQuote(line, '\'') ||
|
||||||
|
hasSurroundedQuote(line, '"') {
|
||||||
|
line = line[1 : len(line)-1]
|
||||||
|
}
|
||||||
|
return line, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parse parses data through an io.Reader.
|
||||||
|
func (f *File) parse(reader io.Reader) (err error) {
|
||||||
|
p := newParser(reader)
|
||||||
|
if err = p.BOM(); err != nil {
|
||||||
|
return fmt.Errorf("BOM: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ignore error because default section name is never empty string.
|
||||||
|
section, _ := f.NewSection(DEFAULT_SECTION)
|
||||||
|
|
||||||
|
var line []byte
|
||||||
|
var inUnparseableSection bool
|
||||||
|
for !p.isEOF {
|
||||||
|
line, err = p.readUntil('\n')
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
line = bytes.TrimLeftFunc(line, unicode.IsSpace)
|
||||||
|
if len(line) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// Comments
|
||||||
|
if line[0] == '#' || line[0] == ';' {
|
||||||
|
// Note: we do not care ending line break,
|
||||||
|
// it is needed for adding second line,
|
||||||
|
// so just clean it once at the end when set to value.
|
||||||
|
p.comment.Write(line)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// Section
|
||||||
|
if line[0] == '[' {
|
||||||
|
// Read to the next ']' (TODO: support quoted strings)
|
||||||
|
// TODO(unknwon): use LastIndexByte when stop supporting Go1.4
|
||||||
|
closeIdx := bytes.LastIndex(line, []byte("]"))
|
||||||
|
if closeIdx == -1 {
|
||||||
|
return fmt.Errorf("unclosed section: %s", line)
|
||||||
|
}
|
||||||
|
|
||||||
|
name := string(line[1:closeIdx])
|
||||||
|
section, err = f.NewSection(name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
comment, has := cleanComment(line[closeIdx+1:])
|
||||||
|
if has {
|
||||||
|
p.comment.Write(comment)
|
||||||
|
}
|
||||||
|
|
||||||
|
section.Comment = strings.TrimSpace(p.comment.String())
|
||||||
|
|
||||||
|
// Reset aotu-counter and comments
|
||||||
|
p.comment.Reset()
|
||||||
|
p.count = 1
|
||||||
|
|
||||||
|
inUnparseableSection = false
|
||||||
|
for i := range f.options.UnparseableSections {
|
||||||
|
if f.options.UnparseableSections[i] == name ||
|
||||||
|
(f.options.Insensitive && strings.ToLower(f.options.UnparseableSections[i]) == strings.ToLower(name)) {
|
||||||
|
inUnparseableSection = true
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if inUnparseableSection {
|
||||||
|
section.isRawSection = true
|
||||||
|
section.rawBody += string(line)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
kname, offset, err := readKeyName(line)
|
||||||
|
if err != nil {
|
||||||
|
// Treat as boolean key when desired, and whole line is key name.
|
||||||
|
if IsErrDelimiterNotFound(err) && f.options.AllowBooleanKeys {
|
||||||
|
kname, err := p.readValue(line, f.options.IgnoreContinuation, f.options.IgnoreInlineComment)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
key, err := section.NewBooleanKey(kname)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
key.Comment = strings.TrimSpace(p.comment.String())
|
||||||
|
p.comment.Reset()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Auto increment.
|
||||||
|
isAutoIncr := false
|
||||||
|
if kname == "-" {
|
||||||
|
isAutoIncr = true
|
||||||
|
kname = "#" + strconv.Itoa(p.count)
|
||||||
|
p.count++
|
||||||
|
}
|
||||||
|
|
||||||
|
value, err := p.readValue(line[offset:], f.options.IgnoreContinuation, f.options.IgnoreInlineComment)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
key, err := section.NewKey(kname, value)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
key.isAutoIncrement = isAutoIncr
|
||||||
|
key.Comment = strings.TrimSpace(p.comment.String())
|
||||||
|
p.comment.Reset()
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
42
vendor/src/github.com/go-ini/ini/parser_test.go
vendored
Normal file
42
vendor/src/github.com/go-ini/ini/parser_test.go
vendored
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
// Copyright 2016 Unknwon
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||||
|
// not use this file except in compliance with the License. You may obtain
|
||||||
|
// a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
// License for the specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
package ini
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
. "github.com/smartystreets/goconvey/convey"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Test_BOM(t *testing.T) {
|
||||||
|
Convey("Test handling BOM", t, func() {
|
||||||
|
Convey("UTF-8-BOM", func() {
|
||||||
|
cfg, err := Load("testdata/UTF-8-BOM.ini")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
So(cfg.Section("author").Key("E-MAIL").String(), ShouldEqual, "u@gogs.io")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("UTF-16-LE-BOM", func() {
|
||||||
|
cfg, err := Load("testdata/UTF-16-LE-BOM.ini")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("UTF-16-BE-BOM", func() {
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
248
vendor/src/github.com/go-ini/ini/section.go
vendored
Normal file
248
vendor/src/github.com/go-ini/ini/section.go
vendored
Normal file
|
@ -0,0 +1,248 @@
|
||||||
|
// Copyright 2014 Unknwon
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||||
|
// not use this file except in compliance with the License. You may obtain
|
||||||
|
// a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
// License for the specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
package ini
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Section represents a config section.
|
||||||
|
type Section struct {
|
||||||
|
f *File
|
||||||
|
Comment string
|
||||||
|
name string
|
||||||
|
keys map[string]*Key
|
||||||
|
keyList []string
|
||||||
|
keysHash map[string]string
|
||||||
|
|
||||||
|
isRawSection bool
|
||||||
|
rawBody string
|
||||||
|
}
|
||||||
|
|
||||||
|
func newSection(f *File, name string) *Section {
|
||||||
|
return &Section{
|
||||||
|
f: f,
|
||||||
|
name: name,
|
||||||
|
keys: make(map[string]*Key),
|
||||||
|
keyList: make([]string, 0, 10),
|
||||||
|
keysHash: make(map[string]string),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Name returns name of Section.
|
||||||
|
func (s *Section) Name() string {
|
||||||
|
return s.name
|
||||||
|
}
|
||||||
|
|
||||||
|
// Body returns rawBody of Section if the section was marked as unparseable.
|
||||||
|
// It still follows the other rules of the INI format surrounding leading/trailing whitespace.
|
||||||
|
func (s *Section) Body() string {
|
||||||
|
return strings.TrimSpace(s.rawBody)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewKey creates a new key to given section.
|
||||||
|
func (s *Section) NewKey(name, val string) (*Key, error) {
|
||||||
|
if len(name) == 0 {
|
||||||
|
return nil, errors.New("error creating new key: empty key name")
|
||||||
|
} else if s.f.options.Insensitive {
|
||||||
|
name = strings.ToLower(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if s.f.BlockMode {
|
||||||
|
s.f.lock.Lock()
|
||||||
|
defer s.f.lock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
if inSlice(name, s.keyList) {
|
||||||
|
if s.f.options.AllowShadows {
|
||||||
|
if err := s.keys[name].addShadow(val); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
s.keys[name].value = val
|
||||||
|
}
|
||||||
|
return s.keys[name], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
s.keyList = append(s.keyList, name)
|
||||||
|
s.keys[name] = newKey(s, name, val)
|
||||||
|
s.keysHash[name] = val
|
||||||
|
return s.keys[name], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewBooleanKey creates a new boolean type key to given section.
|
||||||
|
func (s *Section) NewBooleanKey(name string) (*Key, error) {
|
||||||
|
key, err := s.NewKey(name, "true")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
key.isBooleanType = true
|
||||||
|
return key, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetKey returns key in section by given name.
|
||||||
|
func (s *Section) GetKey(name string) (*Key, error) {
|
||||||
|
// FIXME: change to section level lock?
|
||||||
|
if s.f.BlockMode {
|
||||||
|
s.f.lock.RLock()
|
||||||
|
}
|
||||||
|
if s.f.options.Insensitive {
|
||||||
|
name = strings.ToLower(name)
|
||||||
|
}
|
||||||
|
key := s.keys[name]
|
||||||
|
if s.f.BlockMode {
|
||||||
|
s.f.lock.RUnlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
if key == nil {
|
||||||
|
// Check if it is a child-section.
|
||||||
|
sname := s.name
|
||||||
|
for {
|
||||||
|
if i := strings.LastIndex(sname, "."); i > -1 {
|
||||||
|
sname = sname[:i]
|
||||||
|
sec, err := s.f.GetSection(sname)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return sec.GetKey(name)
|
||||||
|
} else {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("error when getting key of section '%s': key '%s' not exists", s.name, name)
|
||||||
|
}
|
||||||
|
return key, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// HasKey returns true if section contains a key with given name.
|
||||||
|
func (s *Section) HasKey(name string) bool {
|
||||||
|
key, _ := s.GetKey(name)
|
||||||
|
return key != nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Haskey is a backwards-compatible name for HasKey.
|
||||||
|
func (s *Section) Haskey(name string) bool {
|
||||||
|
return s.HasKey(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HasValue returns true if section contains given raw value.
|
||||||
|
func (s *Section) HasValue(value string) bool {
|
||||||
|
if s.f.BlockMode {
|
||||||
|
s.f.lock.RLock()
|
||||||
|
defer s.f.lock.RUnlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, k := range s.keys {
|
||||||
|
if value == k.value {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Key assumes named Key exists in section and returns a zero-value when not.
|
||||||
|
func (s *Section) Key(name string) *Key {
|
||||||
|
key, err := s.GetKey(name)
|
||||||
|
if err != nil {
|
||||||
|
// It's OK here because the only possible error is empty key name,
|
||||||
|
// but if it's empty, this piece of code won't be executed.
|
||||||
|
key, _ = s.NewKey(name, "")
|
||||||
|
return key
|
||||||
|
}
|
||||||
|
return key
|
||||||
|
}
|
||||||
|
|
||||||
|
// Keys returns list of keys of section.
|
||||||
|
func (s *Section) Keys() []*Key {
|
||||||
|
keys := make([]*Key, len(s.keyList))
|
||||||
|
for i := range s.keyList {
|
||||||
|
keys[i] = s.Key(s.keyList[i])
|
||||||
|
}
|
||||||
|
return keys
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParentKeys returns list of keys of parent section.
|
||||||
|
func (s *Section) ParentKeys() []*Key {
|
||||||
|
var parentKeys []*Key
|
||||||
|
sname := s.name
|
||||||
|
for {
|
||||||
|
if i := strings.LastIndex(sname, "."); i > -1 {
|
||||||
|
sname = sname[:i]
|
||||||
|
sec, err := s.f.GetSection(sname)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
parentKeys = append(parentKeys, sec.Keys()...)
|
||||||
|
} else {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
return parentKeys
|
||||||
|
}
|
||||||
|
|
||||||
|
// KeyStrings returns list of key names of section.
|
||||||
|
func (s *Section) KeyStrings() []string {
|
||||||
|
list := make([]string, len(s.keyList))
|
||||||
|
copy(list, s.keyList)
|
||||||
|
return list
|
||||||
|
}
|
||||||
|
|
||||||
|
// KeysHash returns keys hash consisting of names and values.
|
||||||
|
func (s *Section) KeysHash() map[string]string {
|
||||||
|
if s.f.BlockMode {
|
||||||
|
s.f.lock.RLock()
|
||||||
|
defer s.f.lock.RUnlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
hash := map[string]string{}
|
||||||
|
for key, value := range s.keysHash {
|
||||||
|
hash[key] = value
|
||||||
|
}
|
||||||
|
return hash
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteKey deletes a key from section.
|
||||||
|
func (s *Section) DeleteKey(name string) {
|
||||||
|
if s.f.BlockMode {
|
||||||
|
s.f.lock.Lock()
|
||||||
|
defer s.f.lock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, k := range s.keyList {
|
||||||
|
if k == name {
|
||||||
|
s.keyList = append(s.keyList[:i], s.keyList[i+1:]...)
|
||||||
|
delete(s.keys, name)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChildSections returns a list of child sections of current section.
|
||||||
|
// For example, "[parent.child1]" and "[parent.child12]" are child sections
|
||||||
|
// of section "[parent]".
|
||||||
|
func (s *Section) ChildSections() []*Section {
|
||||||
|
prefix := s.name + "."
|
||||||
|
children := make([]*Section, 0, 3)
|
||||||
|
for _, name := range s.f.sectionList {
|
||||||
|
if strings.HasPrefix(name, prefix) {
|
||||||
|
children = append(children, s.f.sections[name])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return children
|
||||||
|
}
|
75
vendor/src/github.com/go-ini/ini/section_test.go
vendored
Normal file
75
vendor/src/github.com/go-ini/ini/section_test.go
vendored
Normal file
|
@ -0,0 +1,75 @@
|
||||||
|
// Copyright 2014 Unknwon
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||||
|
// not use this file except in compliance with the License. You may obtain
|
||||||
|
// a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
// License for the specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
package ini
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
. "github.com/smartystreets/goconvey/convey"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Test_Section(t *testing.T) {
|
||||||
|
Convey("Test CRD sections", t, func() {
|
||||||
|
cfg, err := Load([]byte(_CONF_DATA), "testdata/conf.ini")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
Convey("Get section strings", func() {
|
||||||
|
So(strings.Join(cfg.SectionStrings(), ","), ShouldEqual, "DEFAULT,author,package,package.sub,features,types,array,note,comments,advance")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Delete a section", func() {
|
||||||
|
cfg.DeleteSection("")
|
||||||
|
So(cfg.SectionStrings()[0], ShouldNotEqual, DEFAULT_SECTION)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Create new sections", func() {
|
||||||
|
cfg.NewSections("test", "test2")
|
||||||
|
_, err := cfg.GetSection("test")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
_, err = cfg.GetSection("test2")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func Test_SectionRaw(t *testing.T) {
|
||||||
|
Convey("Test section raw string", t, func() {
|
||||||
|
cfg, err := LoadSources(
|
||||||
|
LoadOptions{
|
||||||
|
Insensitive: true,
|
||||||
|
UnparseableSections: []string{"core_lesson", "comments"},
|
||||||
|
},
|
||||||
|
"testdata/aicc.ini")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
Convey("Get section strings", func() {
|
||||||
|
So(strings.Join(cfg.SectionStrings(), ","), ShouldEqual, "DEFAULT,core,core_lesson,comments")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Validate non-raw section", func() {
|
||||||
|
val, err := cfg.Section("core").GetKey("lesson_status")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(val.String(), ShouldEqual, "C")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Validate raw section", func() {
|
||||||
|
So(cfg.Section("core_lesson").Body(), ShouldEqual, `my lesson state data – 1111111111111111111000000000000000001110000
|
||||||
|
111111111111111111100000000000111000000000 – end my lesson state data`)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
450
vendor/src/github.com/go-ini/ini/struct.go
vendored
Normal file
450
vendor/src/github.com/go-ini/ini/struct.go
vendored
Normal file
|
@ -0,0 +1,450 @@
|
||||||
|
// Copyright 2014 Unknwon
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||||
|
// not use this file except in compliance with the License. You may obtain
|
||||||
|
// a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
// License for the specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
package ini
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"reflect"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
"unicode"
|
||||||
|
)
|
||||||
|
|
||||||
|
// NameMapper represents a ini tag name mapper.
|
||||||
|
type NameMapper func(string) string
|
||||||
|
|
||||||
|
// Built-in name getters.
|
||||||
|
var (
|
||||||
|
// AllCapsUnderscore converts to format ALL_CAPS_UNDERSCORE.
|
||||||
|
AllCapsUnderscore NameMapper = func(raw string) string {
|
||||||
|
newstr := make([]rune, 0, len(raw))
|
||||||
|
for i, chr := range raw {
|
||||||
|
if isUpper := 'A' <= chr && chr <= 'Z'; isUpper {
|
||||||
|
if i > 0 {
|
||||||
|
newstr = append(newstr, '_')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
newstr = append(newstr, unicode.ToUpper(chr))
|
||||||
|
}
|
||||||
|
return string(newstr)
|
||||||
|
}
|
||||||
|
// TitleUnderscore converts to format title_underscore.
|
||||||
|
TitleUnderscore NameMapper = func(raw string) string {
|
||||||
|
newstr := make([]rune, 0, len(raw))
|
||||||
|
for i, chr := range raw {
|
||||||
|
if isUpper := 'A' <= chr && chr <= 'Z'; isUpper {
|
||||||
|
if i > 0 {
|
||||||
|
newstr = append(newstr, '_')
|
||||||
|
}
|
||||||
|
chr -= ('A' - 'a')
|
||||||
|
}
|
||||||
|
newstr = append(newstr, chr)
|
||||||
|
}
|
||||||
|
return string(newstr)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
func (s *Section) parseFieldName(raw, actual string) string {
|
||||||
|
if len(actual) > 0 {
|
||||||
|
return actual
|
||||||
|
}
|
||||||
|
if s.f.NameMapper != nil {
|
||||||
|
return s.f.NameMapper(raw)
|
||||||
|
}
|
||||||
|
return raw
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseDelim(actual string) string {
|
||||||
|
if len(actual) > 0 {
|
||||||
|
return actual
|
||||||
|
}
|
||||||
|
return ","
|
||||||
|
}
|
||||||
|
|
||||||
|
var reflectTime = reflect.TypeOf(time.Now()).Kind()
|
||||||
|
|
||||||
|
// setSliceWithProperType sets proper values to slice based on its type.
|
||||||
|
func setSliceWithProperType(key *Key, field reflect.Value, delim string, allowShadow bool) error {
|
||||||
|
var strs []string
|
||||||
|
if allowShadow {
|
||||||
|
strs = key.StringsWithShadows(delim)
|
||||||
|
} else {
|
||||||
|
strs = key.Strings(delim)
|
||||||
|
}
|
||||||
|
|
||||||
|
numVals := len(strs)
|
||||||
|
if numVals == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var vals interface{}
|
||||||
|
|
||||||
|
sliceOf := field.Type().Elem().Kind()
|
||||||
|
switch sliceOf {
|
||||||
|
case reflect.String:
|
||||||
|
vals = strs
|
||||||
|
case reflect.Int:
|
||||||
|
vals, _ = key.parseInts(strs, true, false)
|
||||||
|
case reflect.Int64:
|
||||||
|
vals, _ = key.parseInt64s(strs, true, false)
|
||||||
|
case reflect.Uint:
|
||||||
|
vals, _ = key.parseUints(strs, true, false)
|
||||||
|
case reflect.Uint64:
|
||||||
|
vals, _ = key.parseUint64s(strs, true, false)
|
||||||
|
case reflect.Float64:
|
||||||
|
vals, _ = key.parseFloat64s(strs, true, false)
|
||||||
|
case reflectTime:
|
||||||
|
vals, _ = key.parseTimesFormat(time.RFC3339, strs, true, false)
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("unsupported type '[]%s'", sliceOf)
|
||||||
|
}
|
||||||
|
|
||||||
|
slice := reflect.MakeSlice(field.Type(), numVals, numVals)
|
||||||
|
for i := 0; i < numVals; i++ {
|
||||||
|
switch sliceOf {
|
||||||
|
case reflect.String:
|
||||||
|
slice.Index(i).Set(reflect.ValueOf(vals.([]string)[i]))
|
||||||
|
case reflect.Int:
|
||||||
|
slice.Index(i).Set(reflect.ValueOf(vals.([]int)[i]))
|
||||||
|
case reflect.Int64:
|
||||||
|
slice.Index(i).Set(reflect.ValueOf(vals.([]int64)[i]))
|
||||||
|
case reflect.Uint:
|
||||||
|
slice.Index(i).Set(reflect.ValueOf(vals.([]uint)[i]))
|
||||||
|
case reflect.Uint64:
|
||||||
|
slice.Index(i).Set(reflect.ValueOf(vals.([]uint64)[i]))
|
||||||
|
case reflect.Float64:
|
||||||
|
slice.Index(i).Set(reflect.ValueOf(vals.([]float64)[i]))
|
||||||
|
case reflectTime:
|
||||||
|
slice.Index(i).Set(reflect.ValueOf(vals.([]time.Time)[i]))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
field.Set(slice)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// setWithProperType sets proper value to field based on its type,
|
||||||
|
// but it does not return error for failing parsing,
|
||||||
|
// because we want to use default value that is already assigned to strcut.
|
||||||
|
func setWithProperType(t reflect.Type, key *Key, field reflect.Value, delim string, allowShadow bool) error {
|
||||||
|
switch t.Kind() {
|
||||||
|
case reflect.String:
|
||||||
|
if len(key.String()) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
field.SetString(key.String())
|
||||||
|
case reflect.Bool:
|
||||||
|
boolVal, err := key.Bool()
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
field.SetBool(boolVal)
|
||||||
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
||||||
|
durationVal, err := key.Duration()
|
||||||
|
// Skip zero value
|
||||||
|
if err == nil && int(durationVal) > 0 {
|
||||||
|
field.Set(reflect.ValueOf(durationVal))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
intVal, err := key.Int64()
|
||||||
|
if err != nil || intVal == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
field.SetInt(intVal)
|
||||||
|
// byte is an alias for uint8, so supporting uint8 breaks support for byte
|
||||||
|
case reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
||||||
|
durationVal, err := key.Duration()
|
||||||
|
// Skip zero value
|
||||||
|
if err == nil && int(durationVal) > 0 {
|
||||||
|
field.Set(reflect.ValueOf(durationVal))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
uintVal, err := key.Uint64()
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
field.SetUint(uintVal)
|
||||||
|
|
||||||
|
case reflect.Float32, reflect.Float64:
|
||||||
|
floatVal, err := key.Float64()
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
field.SetFloat(floatVal)
|
||||||
|
case reflectTime:
|
||||||
|
timeVal, err := key.Time()
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
field.Set(reflect.ValueOf(timeVal))
|
||||||
|
case reflect.Slice:
|
||||||
|
return setSliceWithProperType(key, field, delim, allowShadow)
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("unsupported type '%s'", t)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseTagOptions(tag string) (rawName string, omitEmpty bool, allowShadow bool) {
|
||||||
|
opts := strings.SplitN(tag, ",", 3)
|
||||||
|
rawName = opts[0]
|
||||||
|
if len(opts) > 1 {
|
||||||
|
omitEmpty = opts[1] == "omitempty"
|
||||||
|
}
|
||||||
|
if len(opts) > 2 {
|
||||||
|
allowShadow = opts[2] == "allowshadow"
|
||||||
|
}
|
||||||
|
return rawName, omitEmpty, allowShadow
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Section) mapTo(val reflect.Value) error {
|
||||||
|
if val.Kind() == reflect.Ptr {
|
||||||
|
val = val.Elem()
|
||||||
|
}
|
||||||
|
typ := val.Type()
|
||||||
|
|
||||||
|
for i := 0; i < typ.NumField(); i++ {
|
||||||
|
field := val.Field(i)
|
||||||
|
tpField := typ.Field(i)
|
||||||
|
|
||||||
|
tag := tpField.Tag.Get("ini")
|
||||||
|
if tag == "-" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
rawName, _, allowShadow := parseTagOptions(tag)
|
||||||
|
fieldName := s.parseFieldName(tpField.Name, rawName)
|
||||||
|
if len(fieldName) == 0 || !field.CanSet() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
isAnonymous := tpField.Type.Kind() == reflect.Ptr && tpField.Anonymous
|
||||||
|
isStruct := tpField.Type.Kind() == reflect.Struct
|
||||||
|
if isAnonymous {
|
||||||
|
field.Set(reflect.New(tpField.Type.Elem()))
|
||||||
|
}
|
||||||
|
|
||||||
|
if isAnonymous || isStruct {
|
||||||
|
if sec, err := s.f.GetSection(fieldName); err == nil {
|
||||||
|
if err = sec.mapTo(field); err != nil {
|
||||||
|
return fmt.Errorf("error mapping field(%s): %v", fieldName, err)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if key, err := s.GetKey(fieldName); err == nil {
|
||||||
|
delim := parseDelim(tpField.Tag.Get("delim"))
|
||||||
|
if err = setWithProperType(tpField.Type, key, field, delim, allowShadow); err != nil {
|
||||||
|
return fmt.Errorf("error mapping field(%s): %v", fieldName, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// MapTo maps section to given struct.
|
||||||
|
func (s *Section) MapTo(v interface{}) error {
|
||||||
|
typ := reflect.TypeOf(v)
|
||||||
|
val := reflect.ValueOf(v)
|
||||||
|
if typ.Kind() == reflect.Ptr {
|
||||||
|
typ = typ.Elem()
|
||||||
|
val = val.Elem()
|
||||||
|
} else {
|
||||||
|
return errors.New("cannot map to non-pointer struct")
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.mapTo(val)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MapTo maps file to given struct.
|
||||||
|
func (f *File) MapTo(v interface{}) error {
|
||||||
|
return f.Section("").MapTo(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MapTo maps data sources to given struct with name mapper.
|
||||||
|
func MapToWithMapper(v interface{}, mapper NameMapper, source interface{}, others ...interface{}) error {
|
||||||
|
cfg, err := Load(source, others...)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
cfg.NameMapper = mapper
|
||||||
|
return cfg.MapTo(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MapTo maps data sources to given struct.
|
||||||
|
func MapTo(v, source interface{}, others ...interface{}) error {
|
||||||
|
return MapToWithMapper(v, nil, source, others...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// reflectSliceWithProperType does the opposite thing as setSliceWithProperType.
|
||||||
|
func reflectSliceWithProperType(key *Key, field reflect.Value, delim string) error {
|
||||||
|
slice := field.Slice(0, field.Len())
|
||||||
|
if field.Len() == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
sliceOf := field.Type().Elem().Kind()
|
||||||
|
for i := 0; i < field.Len(); i++ {
|
||||||
|
switch sliceOf {
|
||||||
|
case reflect.String:
|
||||||
|
buf.WriteString(slice.Index(i).String())
|
||||||
|
case reflect.Int, reflect.Int64:
|
||||||
|
buf.WriteString(fmt.Sprint(slice.Index(i).Int()))
|
||||||
|
case reflect.Uint, reflect.Uint64:
|
||||||
|
buf.WriteString(fmt.Sprint(slice.Index(i).Uint()))
|
||||||
|
case reflect.Float64:
|
||||||
|
buf.WriteString(fmt.Sprint(slice.Index(i).Float()))
|
||||||
|
case reflectTime:
|
||||||
|
buf.WriteString(slice.Index(i).Interface().(time.Time).Format(time.RFC3339))
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("unsupported type '[]%s'", sliceOf)
|
||||||
|
}
|
||||||
|
buf.WriteString(delim)
|
||||||
|
}
|
||||||
|
key.SetValue(buf.String()[:buf.Len()-1])
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// reflectWithProperType does the opposite thing as setWithProperType.
|
||||||
|
func reflectWithProperType(t reflect.Type, key *Key, field reflect.Value, delim string) error {
|
||||||
|
switch t.Kind() {
|
||||||
|
case reflect.String:
|
||||||
|
key.SetValue(field.String())
|
||||||
|
case reflect.Bool:
|
||||||
|
key.SetValue(fmt.Sprint(field.Bool()))
|
||||||
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
||||||
|
key.SetValue(fmt.Sprint(field.Int()))
|
||||||
|
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
||||||
|
key.SetValue(fmt.Sprint(field.Uint()))
|
||||||
|
case reflect.Float32, reflect.Float64:
|
||||||
|
key.SetValue(fmt.Sprint(field.Float()))
|
||||||
|
case reflectTime:
|
||||||
|
key.SetValue(fmt.Sprint(field.Interface().(time.Time).Format(time.RFC3339)))
|
||||||
|
case reflect.Slice:
|
||||||
|
return reflectSliceWithProperType(key, field, delim)
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("unsupported type '%s'", t)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// CR: copied from encoding/json/encode.go with modifications of time.Time support.
|
||||||
|
// TODO: add more test coverage.
|
||||||
|
func isEmptyValue(v reflect.Value) bool {
|
||||||
|
switch v.Kind() {
|
||||||
|
case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
|
||||||
|
return v.Len() == 0
|
||||||
|
case reflect.Bool:
|
||||||
|
return !v.Bool()
|
||||||
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
||||||
|
return v.Int() == 0
|
||||||
|
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
|
||||||
|
return v.Uint() == 0
|
||||||
|
case reflect.Float32, reflect.Float64:
|
||||||
|
return v.Float() == 0
|
||||||
|
case reflectTime:
|
||||||
|
return v.Interface().(time.Time).IsZero()
|
||||||
|
case reflect.Interface, reflect.Ptr:
|
||||||
|
return v.IsNil()
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Section) reflectFrom(val reflect.Value) error {
|
||||||
|
if val.Kind() == reflect.Ptr {
|
||||||
|
val = val.Elem()
|
||||||
|
}
|
||||||
|
typ := val.Type()
|
||||||
|
|
||||||
|
for i := 0; i < typ.NumField(); i++ {
|
||||||
|
field := val.Field(i)
|
||||||
|
tpField := typ.Field(i)
|
||||||
|
|
||||||
|
tag := tpField.Tag.Get("ini")
|
||||||
|
if tag == "-" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
opts := strings.SplitN(tag, ",", 2)
|
||||||
|
if len(opts) == 2 && opts[1] == "omitempty" && isEmptyValue(field) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
fieldName := s.parseFieldName(tpField.Name, opts[0])
|
||||||
|
if len(fieldName) == 0 || !field.CanSet() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tpField.Type.Kind() == reflect.Ptr && tpField.Anonymous) ||
|
||||||
|
(tpField.Type.Kind() == reflect.Struct && tpField.Type.Name() != "Time") {
|
||||||
|
// Note: The only error here is section doesn't exist.
|
||||||
|
sec, err := s.f.GetSection(fieldName)
|
||||||
|
if err != nil {
|
||||||
|
// Note: fieldName can never be empty here, ignore error.
|
||||||
|
sec, _ = s.f.NewSection(fieldName)
|
||||||
|
}
|
||||||
|
if err = sec.reflectFrom(field); err != nil {
|
||||||
|
return fmt.Errorf("error reflecting field (%s): %v", fieldName, err)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// Note: Same reason as secion.
|
||||||
|
key, err := s.GetKey(fieldName)
|
||||||
|
if err != nil {
|
||||||
|
key, _ = s.NewKey(fieldName, "")
|
||||||
|
}
|
||||||
|
if err = reflectWithProperType(tpField.Type, key, field, parseDelim(tpField.Tag.Get("delim"))); err != nil {
|
||||||
|
return fmt.Errorf("error reflecting field (%s): %v", fieldName, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReflectFrom reflects secion from given struct.
|
||||||
|
func (s *Section) ReflectFrom(v interface{}) error {
|
||||||
|
typ := reflect.TypeOf(v)
|
||||||
|
val := reflect.ValueOf(v)
|
||||||
|
if typ.Kind() == reflect.Ptr {
|
||||||
|
typ = typ.Elem()
|
||||||
|
val = val.Elem()
|
||||||
|
} else {
|
||||||
|
return errors.New("cannot reflect from non-pointer struct")
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.reflectFrom(val)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReflectFrom reflects file from given struct.
|
||||||
|
func (f *File) ReflectFrom(v interface{}) error {
|
||||||
|
return f.Section("").ReflectFrom(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReflectFrom reflects data sources from given struct with name mapper.
|
||||||
|
func ReflectFromWithMapper(cfg *File, v interface{}, mapper NameMapper) error {
|
||||||
|
cfg.NameMapper = mapper
|
||||||
|
return cfg.ReflectFrom(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReflectFrom reflects data sources from given struct.
|
||||||
|
func ReflectFrom(cfg *File, v interface{}) error {
|
||||||
|
return ReflectFromWithMapper(cfg, v, nil)
|
||||||
|
}
|
337
vendor/src/github.com/go-ini/ini/struct_test.go
vendored
Normal file
337
vendor/src/github.com/go-ini/ini/struct_test.go
vendored
Normal file
|
@ -0,0 +1,337 @@
|
||||||
|
// Copyright 2014 Unknwon
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||||
|
// not use this file except in compliance with the License. You may obtain
|
||||||
|
// a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
// License for the specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
|
||||||
|
package ini
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
. "github.com/smartystreets/goconvey/convey"
|
||||||
|
)
|
||||||
|
|
||||||
|
type testNested struct {
|
||||||
|
Cities []string `delim:"|"`
|
||||||
|
Visits []time.Time
|
||||||
|
Years []int
|
||||||
|
Numbers []int64
|
||||||
|
Ages []uint
|
||||||
|
Populations []uint64
|
||||||
|
Coordinates []float64
|
||||||
|
Note string
|
||||||
|
Unused int `ini:"-"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type testEmbeded struct {
|
||||||
|
GPA float64
|
||||||
|
}
|
||||||
|
|
||||||
|
type testStruct struct {
|
||||||
|
Name string `ini:"NAME"`
|
||||||
|
Age int
|
||||||
|
Male bool
|
||||||
|
Money float64
|
||||||
|
Born time.Time
|
||||||
|
Time time.Duration `ini:"Duration"`
|
||||||
|
Others testNested
|
||||||
|
*testEmbeded `ini:"grade"`
|
||||||
|
Unused int `ini:"-"`
|
||||||
|
Unsigned uint
|
||||||
|
Omitted bool `ini:"omitthis,omitempty"`
|
||||||
|
Shadows []string `ini:",,allowshadow"`
|
||||||
|
ShadowInts []int `ini:"Shadows,,allowshadow"`
|
||||||
|
}
|
||||||
|
|
||||||
|
const _CONF_DATA_STRUCT = `
|
||||||
|
NAME = Unknwon
|
||||||
|
Age = 21
|
||||||
|
Male = true
|
||||||
|
Money = 1.25
|
||||||
|
Born = 1993-10-07T20:17:05Z
|
||||||
|
Duration = 2h45m
|
||||||
|
Unsigned = 3
|
||||||
|
omitthis = true
|
||||||
|
Shadows = 1, 2
|
||||||
|
Shadows = 3, 4
|
||||||
|
|
||||||
|
[Others]
|
||||||
|
Cities = HangZhou|Boston
|
||||||
|
Visits = 1993-10-07T20:17:05Z, 1993-10-07T20:17:05Z
|
||||||
|
Years = 1993,1994
|
||||||
|
Numbers = 10010,10086
|
||||||
|
Ages = 18,19
|
||||||
|
Populations = 12345678,98765432
|
||||||
|
Coordinates = 192.168,10.11
|
||||||
|
Note = Hello world!
|
||||||
|
|
||||||
|
[grade]
|
||||||
|
GPA = 2.8
|
||||||
|
|
||||||
|
[foo.bar]
|
||||||
|
Here = there
|
||||||
|
When = then
|
||||||
|
`
|
||||||
|
|
||||||
|
type unsupport struct {
|
||||||
|
Byte byte
|
||||||
|
}
|
||||||
|
|
||||||
|
type unsupport2 struct {
|
||||||
|
Others struct {
|
||||||
|
Cities byte
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type unsupport3 struct {
|
||||||
|
Cities byte
|
||||||
|
}
|
||||||
|
|
||||||
|
type unsupport4 struct {
|
||||||
|
*unsupport3 `ini:"Others"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type defaultValue struct {
|
||||||
|
Name string
|
||||||
|
Age int
|
||||||
|
Male bool
|
||||||
|
Money float64
|
||||||
|
Born time.Time
|
||||||
|
Cities []string
|
||||||
|
}
|
||||||
|
|
||||||
|
type fooBar struct {
|
||||||
|
Here, When string
|
||||||
|
}
|
||||||
|
|
||||||
|
const _INVALID_DATA_CONF_STRUCT = `
|
||||||
|
Name =
|
||||||
|
Age = age
|
||||||
|
Male = 123
|
||||||
|
Money = money
|
||||||
|
Born = nil
|
||||||
|
Cities =
|
||||||
|
`
|
||||||
|
|
||||||
|
func Test_Struct(t *testing.T) {
|
||||||
|
Convey("Map to struct", t, func() {
|
||||||
|
Convey("Map file to struct", func() {
|
||||||
|
ts := new(testStruct)
|
||||||
|
So(MapTo(ts, []byte(_CONF_DATA_STRUCT)), ShouldBeNil)
|
||||||
|
|
||||||
|
So(ts.Name, ShouldEqual, "Unknwon")
|
||||||
|
So(ts.Age, ShouldEqual, 21)
|
||||||
|
So(ts.Male, ShouldBeTrue)
|
||||||
|
So(ts.Money, ShouldEqual, 1.25)
|
||||||
|
So(ts.Unsigned, ShouldEqual, 3)
|
||||||
|
|
||||||
|
t, err := time.Parse(time.RFC3339, "1993-10-07T20:17:05Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(ts.Born.String(), ShouldEqual, t.String())
|
||||||
|
|
||||||
|
dur, err := time.ParseDuration("2h45m")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(ts.Time.Seconds(), ShouldEqual, dur.Seconds())
|
||||||
|
|
||||||
|
So(strings.Join(ts.Others.Cities, ","), ShouldEqual, "HangZhou,Boston")
|
||||||
|
So(ts.Others.Visits[0].String(), ShouldEqual, t.String())
|
||||||
|
So(fmt.Sprint(ts.Others.Years), ShouldEqual, "[1993 1994]")
|
||||||
|
So(fmt.Sprint(ts.Others.Numbers), ShouldEqual, "[10010 10086]")
|
||||||
|
So(fmt.Sprint(ts.Others.Ages), ShouldEqual, "[18 19]")
|
||||||
|
So(fmt.Sprint(ts.Others.Populations), ShouldEqual, "[12345678 98765432]")
|
||||||
|
So(fmt.Sprint(ts.Others.Coordinates), ShouldEqual, "[192.168 10.11]")
|
||||||
|
So(ts.Others.Note, ShouldEqual, "Hello world!")
|
||||||
|
So(ts.testEmbeded.GPA, ShouldEqual, 2.8)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Map section to struct", func() {
|
||||||
|
foobar := new(fooBar)
|
||||||
|
f, err := Load([]byte(_CONF_DATA_STRUCT))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
|
||||||
|
So(f.Section("foo.bar").MapTo(foobar), ShouldBeNil)
|
||||||
|
So(foobar.Here, ShouldEqual, "there")
|
||||||
|
So(foobar.When, ShouldEqual, "then")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Map to non-pointer struct", func() {
|
||||||
|
cfg, err := Load([]byte(_CONF_DATA_STRUCT))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
So(cfg.MapTo(testStruct{}), ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Map to unsupported type", func() {
|
||||||
|
cfg, err := Load([]byte(_CONF_DATA_STRUCT))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
cfg.NameMapper = func(raw string) string {
|
||||||
|
if raw == "Byte" {
|
||||||
|
return "NAME"
|
||||||
|
}
|
||||||
|
return raw
|
||||||
|
}
|
||||||
|
So(cfg.MapTo(&unsupport{}), ShouldNotBeNil)
|
||||||
|
So(cfg.MapTo(&unsupport2{}), ShouldNotBeNil)
|
||||||
|
So(cfg.MapTo(&unsupport4{}), ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Map to omitempty field", func() {
|
||||||
|
ts := new(testStruct)
|
||||||
|
So(MapTo(ts, []byte(_CONF_DATA_STRUCT)), ShouldBeNil)
|
||||||
|
|
||||||
|
So(ts.Omitted, ShouldEqual, true)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Map with shadows", func() {
|
||||||
|
cfg, err := LoadSources(LoadOptions{AllowShadows: true}, []byte(_CONF_DATA_STRUCT))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
ts := new(testStruct)
|
||||||
|
So(cfg.MapTo(ts), ShouldBeNil)
|
||||||
|
|
||||||
|
So(strings.Join(ts.Shadows, " "), ShouldEqual, "1 2 3 4")
|
||||||
|
So(fmt.Sprintf("%v", ts.ShadowInts), ShouldEqual, "[1 2 3 4]")
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Map from invalid data source", func() {
|
||||||
|
So(MapTo(&testStruct{}, "hi"), ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Map to wrong types and gain default values", func() {
|
||||||
|
cfg, err := Load([]byte(_INVALID_DATA_CONF_STRUCT))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
|
||||||
|
t, err := time.Parse(time.RFC3339, "1993-10-07T20:17:05Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
dv := &defaultValue{"Joe", 10, true, 1.25, t, []string{"HangZhou", "Boston"}}
|
||||||
|
So(cfg.MapTo(dv), ShouldBeNil)
|
||||||
|
So(dv.Name, ShouldEqual, "Joe")
|
||||||
|
So(dv.Age, ShouldEqual, 10)
|
||||||
|
So(dv.Male, ShouldBeTrue)
|
||||||
|
So(dv.Money, ShouldEqual, 1.25)
|
||||||
|
So(dv.Born.String(), ShouldEqual, t.String())
|
||||||
|
So(strings.Join(dv.Cities, ","), ShouldEqual, "HangZhou,Boston")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Reflect from struct", t, func() {
|
||||||
|
type Embeded struct {
|
||||||
|
Dates []time.Time `delim:"|"`
|
||||||
|
Places []string
|
||||||
|
Years []int
|
||||||
|
Numbers []int64
|
||||||
|
Ages []uint
|
||||||
|
Populations []uint64
|
||||||
|
Coordinates []float64
|
||||||
|
None []int
|
||||||
|
}
|
||||||
|
type Author struct {
|
||||||
|
Name string `ini:"NAME"`
|
||||||
|
Male bool
|
||||||
|
Age int
|
||||||
|
Height uint
|
||||||
|
GPA float64
|
||||||
|
Date time.Time
|
||||||
|
NeverMind string `ini:"-"`
|
||||||
|
*Embeded `ini:"infos"`
|
||||||
|
}
|
||||||
|
|
||||||
|
t, err := time.Parse(time.RFC3339, "1993-10-07T20:17:05Z")
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
a := &Author{"Unknwon", true, 21, 100, 2.8, t, "",
|
||||||
|
&Embeded{
|
||||||
|
[]time.Time{t, t},
|
||||||
|
[]string{"HangZhou", "Boston"},
|
||||||
|
[]int{1993, 1994},
|
||||||
|
[]int64{10010, 10086},
|
||||||
|
[]uint{18, 19},
|
||||||
|
[]uint64{12345678, 98765432},
|
||||||
|
[]float64{192.168, 10.11},
|
||||||
|
[]int{},
|
||||||
|
}}
|
||||||
|
cfg := Empty()
|
||||||
|
So(ReflectFrom(cfg, a), ShouldBeNil)
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
_, err = cfg.WriteTo(&buf)
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(buf.String(), ShouldEqual, `NAME = Unknwon
|
||||||
|
Male = true
|
||||||
|
Age = 21
|
||||||
|
Height = 100
|
||||||
|
GPA = 2.8
|
||||||
|
Date = 1993-10-07T20:17:05Z
|
||||||
|
|
||||||
|
[infos]
|
||||||
|
Dates = 1993-10-07T20:17:05Z|1993-10-07T20:17:05Z
|
||||||
|
Places = HangZhou,Boston
|
||||||
|
Years = 1993,1994
|
||||||
|
Numbers = 10010,10086
|
||||||
|
Ages = 18,19
|
||||||
|
Populations = 12345678,98765432
|
||||||
|
Coordinates = 192.168,10.11
|
||||||
|
None =
|
||||||
|
|
||||||
|
`)
|
||||||
|
|
||||||
|
Convey("Reflect from non-point struct", func() {
|
||||||
|
So(ReflectFrom(cfg, Author{}), ShouldNotBeNil)
|
||||||
|
})
|
||||||
|
|
||||||
|
Convey("Reflect from struct with omitempty", func() {
|
||||||
|
cfg := Empty()
|
||||||
|
type SpecialStruct struct {
|
||||||
|
FirstName string `ini:"first_name"`
|
||||||
|
LastName string `ini:"last_name"`
|
||||||
|
JustOmitMe string `ini:"omitempty"`
|
||||||
|
LastLogin time.Time `ini:"last_login,omitempty"`
|
||||||
|
LastLogin2 time.Time `ini:",omitempty"`
|
||||||
|
NotEmpty int `ini:"omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
So(ReflectFrom(cfg, &SpecialStruct{FirstName: "John", LastName: "Doe", NotEmpty: 9}), ShouldBeNil)
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
_, err = cfg.WriteTo(&buf)
|
||||||
|
So(buf.String(), ShouldEqual, `first_name = John
|
||||||
|
last_name = Doe
|
||||||
|
omitempty = 9
|
||||||
|
|
||||||
|
`)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
type testMapper struct {
|
||||||
|
PackageName string
|
||||||
|
}
|
||||||
|
|
||||||
|
func Test_NameGetter(t *testing.T) {
|
||||||
|
Convey("Test name mappers", t, func() {
|
||||||
|
So(MapToWithMapper(&testMapper{}, TitleUnderscore, []byte("packag_name=ini")), ShouldBeNil)
|
||||||
|
|
||||||
|
cfg, err := Load([]byte("PACKAGE_NAME=ini"))
|
||||||
|
So(err, ShouldBeNil)
|
||||||
|
So(cfg, ShouldNotBeNil)
|
||||||
|
|
||||||
|
cfg.NameMapper = AllCapsUnderscore
|
||||||
|
tg := new(testMapper)
|
||||||
|
So(cfg.MapTo(tg), ShouldBeNil)
|
||||||
|
So(tg.PackageName, ShouldEqual, "ini")
|
||||||
|
})
|
||||||
|
}
|
BIN
vendor/src/github.com/go-ini/ini/testdata/UTF-16-BE-BOM.ini
vendored
Normal file
BIN
vendor/src/github.com/go-ini/ini/testdata/UTF-16-BE-BOM.ini
vendored
Normal file
Binary file not shown.
BIN
vendor/src/github.com/go-ini/ini/testdata/UTF-16-LE-BOM.ini
vendored
Normal file
BIN
vendor/src/github.com/go-ini/ini/testdata/UTF-16-LE-BOM.ini
vendored
Normal file
Binary file not shown.
2
vendor/src/github.com/go-ini/ini/testdata/UTF-8-BOM.ini
vendored
Normal file
2
vendor/src/github.com/go-ini/ini/testdata/UTF-8-BOM.ini
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
[author]
|
||||||
|
E-MAIL = u@gogs.io
|
11
vendor/src/github.com/go-ini/ini/testdata/aicc.ini
vendored
Normal file
11
vendor/src/github.com/go-ini/ini/testdata/aicc.ini
vendored
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
[Core]
|
||||||
|
Lesson_Location = 87
|
||||||
|
Lesson_Status = C
|
||||||
|
Score = 3
|
||||||
|
Time = 00:02:30
|
||||||
|
|
||||||
|
[CORE_LESSON]
|
||||||
|
my lesson state data – 1111111111111111111000000000000000001110000
|
||||||
|
111111111111111111100000000000111000000000 – end my lesson state data
|
||||||
|
[COMMENTS]
|
||||||
|
<1><L.Slide#2> This slide has the fuel listed in the wrong units <e.1>
|
2
vendor/src/github.com/go-ini/ini/testdata/conf.ini
vendored
Normal file
2
vendor/src/github.com/go-ini/ini/testdata/conf.ini
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
[author]
|
||||||
|
E-MAIL = u@gogs.io
|
21
vendor/src/github.com/minio/go-homedir/LICENSE
vendored
Normal file
21
vendor/src/github.com/minio/go-homedir/LICENSE
vendored
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2013 Mitchell Hashimoto
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
THE SOFTWARE.
|
16
vendor/src/github.com/minio/go-homedir/README.md
vendored
Normal file
16
vendor/src/github.com/minio/go-homedir/README.md
vendored
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
# go-homedir
|
||||||
|
|
||||||
|
This is a Go library for detecting the user's home directory without
|
||||||
|
the use of cgo, so the library can be used in cross-compilation environments.
|
||||||
|
|
||||||
|
Usage is incredibly simple, just call `homedir.Dir()` to get the home directory
|
||||||
|
for a user, and `homedir.Expand()` to expand the `~` in a path to the home
|
||||||
|
directory.
|
||||||
|
|
||||||
|
**Why not just use `os/user`?** The built-in `os/user` package is not
|
||||||
|
available on certain architectures such as i386 or PNaCl. Additionally
|
||||||
|
it has a cgo dependency on Darwin systems. This means that any Go code
|
||||||
|
that uses that package cannot cross compile. But 99% of the time the
|
||||||
|
use for `os/user` is just to retrieve the home directory, which we can
|
||||||
|
do for the current user without cgo. This library does that, enabling
|
||||||
|
cross-compilation.
|
64
vendor/src/github.com/minio/go-homedir/dir_posix.go
vendored
Normal file
64
vendor/src/github.com/minio/go-homedir/dir_posix.go
vendored
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
// +build !windows
|
||||||
|
|
||||||
|
// Copyright 2016 (C) Mitchell Hashimoto
|
||||||
|
// Distributed under the MIT License.
|
||||||
|
|
||||||
|
package homedir
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"os/user"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// dir returns the homedir of current user for all POSIX compatible
|
||||||
|
// operating systems.
|
||||||
|
func dir() (string, error) {
|
||||||
|
// First prefer the HOME environmental variable
|
||||||
|
if home := os.Getenv("HOME"); home != "" {
|
||||||
|
return home, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// user.Current is not implemented for i386 and PNaCL like environments.
|
||||||
|
if currUser, err := user.Current(); err == nil {
|
||||||
|
return currUser.HomeDir, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// If that fails, try getent
|
||||||
|
var stdout bytes.Buffer
|
||||||
|
cmd := exec.Command("getent", "passwd", strconv.Itoa(os.Getuid()))
|
||||||
|
cmd.Stdout = &stdout
|
||||||
|
if err := cmd.Run(); err != nil {
|
||||||
|
// If "getent" is missing, ignore it
|
||||||
|
if err == exec.ErrNotFound {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if passwd := strings.TrimSpace(stdout.String()); passwd != "" {
|
||||||
|
// username:password:uid:gid:gecos:home:shell
|
||||||
|
passwdParts := strings.SplitN(passwd, ":", 7)
|
||||||
|
if len(passwdParts) > 5 {
|
||||||
|
return passwdParts[5], nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If all else fails, try the shell
|
||||||
|
stdout.Reset()
|
||||||
|
cmd = exec.Command("sh", "-c", "cd && pwd")
|
||||||
|
cmd.Stdout = &stdout
|
||||||
|
if err := cmd.Run(); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
result := strings.TrimSpace(stdout.String())
|
||||||
|
if result == "" {
|
||||||
|
return "", errors.New("blank output when reading home directory")
|
||||||
|
}
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
}
|
24
vendor/src/github.com/minio/go-homedir/dir_windows.go
vendored
Normal file
24
vendor/src/github.com/minio/go-homedir/dir_windows.go
vendored
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
// Copyright 2016 (C) Mitchell Hashimoto
|
||||||
|
// Distributed under the MIT License.
|
||||||
|
|
||||||
|
package homedir
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"os"
|
||||||
|
)
|
||||||
|
|
||||||
|
// dir returns the homedir of current user for MS Windows OS.
|
||||||
|
func dir() (string, error) {
|
||||||
|
drive := os.Getenv("HOMEDRIVE")
|
||||||
|
path := os.Getenv("HOMEPATH")
|
||||||
|
home := drive + path
|
||||||
|
if drive == "" || path == "" {
|
||||||
|
home = os.Getenv("USERPROFILE")
|
||||||
|
}
|
||||||
|
if home == "" {
|
||||||
|
return "", errors.New("HOMEDRIVE, HOMEPATH, and USERPROFILE are blank")
|
||||||
|
}
|
||||||
|
|
||||||
|
return home, nil
|
||||||
|
}
|
68
vendor/src/github.com/minio/go-homedir/homedir.go
vendored
Normal file
68
vendor/src/github.com/minio/go-homedir/homedir.go
vendored
Normal file
|
@ -0,0 +1,68 @@
|
||||||
|
// Copyright 2016 (C) Mitchell Hashimoto
|
||||||
|
// Distributed under the MIT License.
|
||||||
|
|
||||||
|
// Package homedir implements a portable function to determine current user's homedir.
|
||||||
|
package homedir
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"path/filepath"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DisableCache will disable caching of the home directory. Caching is enabled
|
||||||
|
// by default.
|
||||||
|
var DisableCache bool
|
||||||
|
|
||||||
|
var homedirCache string
|
||||||
|
var cacheLock sync.Mutex
|
||||||
|
|
||||||
|
// Dir returns the home directory for the executing user.
|
||||||
|
//
|
||||||
|
// This uses an OS-specific method for discovering the home directory.
|
||||||
|
// An error is returned if a home directory cannot be detected.
|
||||||
|
func Dir() (string, error) {
|
||||||
|
cacheLock.Lock()
|
||||||
|
defer cacheLock.Unlock()
|
||||||
|
|
||||||
|
// Return cached homedir if available.
|
||||||
|
if !DisableCache {
|
||||||
|
if homedirCache != "" {
|
||||||
|
return homedirCache, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine OS speific current homedir.
|
||||||
|
result, err := dir()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cache for future lookups.
|
||||||
|
homedirCache = result
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Expand expands the path to include the home directory if the path
|
||||||
|
// is prefixed with `~`. If it isn't prefixed with `~`, the path is
|
||||||
|
// returned as-is.
|
||||||
|
func Expand(path string) (string, error) {
|
||||||
|
if len(path) == 0 {
|
||||||
|
return path, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if path[0] != '~' {
|
||||||
|
return path, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(path) > 1 && path[1] != '/' && path[1] != '\\' {
|
||||||
|
return "", errors.New("cannot expand user-specific home dir")
|
||||||
|
}
|
||||||
|
|
||||||
|
dir, err := Dir()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
return filepath.Join(dir, path[1:]), nil
|
||||||
|
}
|
114
vendor/src/github.com/minio/go-homedir/homedir_test.go
vendored
Normal file
114
vendor/src/github.com/minio/go-homedir/homedir_test.go
vendored
Normal file
|
@ -0,0 +1,114 @@
|
||||||
|
package homedir
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"os/user"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func patchEnv(key, value string) func() {
|
||||||
|
bck := os.Getenv(key)
|
||||||
|
deferFunc := func() {
|
||||||
|
os.Setenv(key, bck)
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Setenv(key, value)
|
||||||
|
return deferFunc
|
||||||
|
}
|
||||||
|
|
||||||
|
func BenchmarkDir(b *testing.B) {
|
||||||
|
// We do this for any "warmups"
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
Dir()
|
||||||
|
}
|
||||||
|
|
||||||
|
b.ResetTimer()
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
Dir()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDir(t *testing.T) {
|
||||||
|
// NOTE: This test is not portable. If user.Current() worked
|
||||||
|
// everywhere, we wouldn't need our package in the first place.
|
||||||
|
u, err := user.Current()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("err: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
dir, err := Dir()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("err: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if u.HomeDir != dir {
|
||||||
|
t.Fatalf("%#v != %#v", u.HomeDir, dir)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExpand(t *testing.T) {
|
||||||
|
u, err := user.Current()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("err: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cases := []struct {
|
||||||
|
Input string
|
||||||
|
Output string
|
||||||
|
Err bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
"/foo",
|
||||||
|
"/foo",
|
||||||
|
false,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"~/foo",
|
||||||
|
fmt.Sprintf("%s/foo", u.HomeDir),
|
||||||
|
false,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
false,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"~",
|
||||||
|
u.HomeDir,
|
||||||
|
false,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"~foo/foo",
|
||||||
|
"",
|
||||||
|
true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range cases {
|
||||||
|
actual, err := Expand(tc.Input)
|
||||||
|
if (err != nil) != tc.Err {
|
||||||
|
t.Fatalf("Input: %#v\n\nErr: %s", tc.Input, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if actual != tc.Output {
|
||||||
|
t.Fatalf("Input: %#v\n\nOutput: %#v", tc.Input, actual)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
DisableCache = true
|
||||||
|
defer func() { DisableCache = false }()
|
||||||
|
defer patchEnv("HOME", "/custom/path/")()
|
||||||
|
expected := "/custom/path/foo/bar"
|
||||||
|
actual, err := Expand("~/foo/bar")
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("No error is expected, got: %v", err)
|
||||||
|
} else if actual != "/custom/path/foo/bar" {
|
||||||
|
t.Errorf("Expected: %v; actual: %v", expected, actual)
|
||||||
|
}
|
||||||
|
}
|
|
@ -122,21 +122,38 @@ func (c Client) PresignedPostPolicy(p *PostPolicy) (u *url.URL, formData map[str
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get credentials from the configured credentials provider.
|
||||||
|
credValues, err := c.credsProvider.Get()
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
signerType = credValues.SignerType
|
||||||
|
sessionToken = credValues.SessionToken
|
||||||
|
accessKeyID = credValues.AccessKeyID
|
||||||
|
secretAccessKey = credValues.SecretAccessKey
|
||||||
|
)
|
||||||
|
|
||||||
|
if signerType.IsAnonymous() {
|
||||||
|
return nil, nil, ErrInvalidArgument("Presigned operations are not supported for anonymous credentials")
|
||||||
|
}
|
||||||
|
|
||||||
// Keep time.
|
// Keep time.
|
||||||
t := time.Now().UTC()
|
t := time.Now().UTC()
|
||||||
// For signature version '2' handle here.
|
// For signature version '2' handle here.
|
||||||
if c.signature.isV2() {
|
if signerType.IsV2() {
|
||||||
policyBase64 := p.base64()
|
policyBase64 := p.base64()
|
||||||
p.formData["policy"] = policyBase64
|
p.formData["policy"] = policyBase64
|
||||||
// For Google endpoint set this value to be 'GoogleAccessId'.
|
// For Google endpoint set this value to be 'GoogleAccessId'.
|
||||||
if s3utils.IsGoogleEndpoint(c.endpointURL) {
|
if s3utils.IsGoogleEndpoint(c.endpointURL) {
|
||||||
p.formData["GoogleAccessId"] = c.accessKeyID
|
p.formData["GoogleAccessId"] = accessKeyID
|
||||||
} else {
|
} else {
|
||||||
// For all other endpoints set this value to be 'AWSAccessKeyId'.
|
// For all other endpoints set this value to be 'AWSAccessKeyId'.
|
||||||
p.formData["AWSAccessKeyId"] = c.accessKeyID
|
p.formData["AWSAccessKeyId"] = accessKeyID
|
||||||
}
|
}
|
||||||
// Sign the policy.
|
// Sign the policy.
|
||||||
p.formData["signature"] = s3signer.PostPresignSignatureV2(policyBase64, c.secretAccessKey)
|
p.formData["signature"] = s3signer.PostPresignSignatureV2(policyBase64, secretAccessKey)
|
||||||
return u, p.formData, nil
|
return u, p.formData, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -159,7 +176,7 @@ func (c Client) PresignedPostPolicy(p *PostPolicy) (u *url.URL, formData map[str
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add a credential policy.
|
// Add a credential policy.
|
||||||
credential := s3signer.GetCredential(c.accessKeyID, location, t)
|
credential := s3signer.GetCredential(accessKeyID, location, t)
|
||||||
if err = p.addNewPolicy(policyCondition{
|
if err = p.addNewPolicy(policyCondition{
|
||||||
matchType: "eq",
|
matchType: "eq",
|
||||||
condition: "$x-amz-credential",
|
condition: "$x-amz-credential",
|
||||||
|
@ -168,13 +185,27 @@ func (c Client) PresignedPostPolicy(p *PostPolicy) (u *url.URL, formData map[str
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if sessionToken != "" {
|
||||||
|
if err = p.addNewPolicy(policyCondition{
|
||||||
|
matchType: "eq",
|
||||||
|
condition: "$x-amz-security-token",
|
||||||
|
value: sessionToken,
|
||||||
|
}); err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Get base64 encoded policy.
|
// Get base64 encoded policy.
|
||||||
policyBase64 := p.base64()
|
policyBase64 := p.base64()
|
||||||
|
|
||||||
// Fill in the form data.
|
// Fill in the form data.
|
||||||
p.formData["policy"] = policyBase64
|
p.formData["policy"] = policyBase64
|
||||||
p.formData["x-amz-algorithm"] = signV4Algorithm
|
p.formData["x-amz-algorithm"] = signV4Algorithm
|
||||||
p.formData["x-amz-credential"] = credential
|
p.formData["x-amz-credential"] = credential
|
||||||
p.formData["x-amz-date"] = t.Format(iso8601DateFormat)
|
p.formData["x-amz-date"] = t.Format(iso8601DateFormat)
|
||||||
p.formData["x-amz-signature"] = s3signer.PostPresignSignatureV4(policyBase64, t, c.secretAccessKey, location)
|
if sessionToken != "" {
|
||||||
|
p.formData["x-amz-security-token"] = sessionToken
|
||||||
|
}
|
||||||
|
p.formData["x-amz-signature"] = s3signer.PostPresignSignatureV4(policyBase64, t, secretAccessKey, location)
|
||||||
return u, p.formData, nil
|
return u, p.formData, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015, 2016 Minio, Inc.
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2015, 2016, 2017 Minio, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -28,6 +29,7 @@ import (
|
||||||
"net/url"
|
"net/url"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
|
"github.com/minio/minio-go/pkg/credentials"
|
||||||
"github.com/minio/minio-go/pkg/policy"
|
"github.com/minio/minio-go/pkg/policy"
|
||||||
"github.com/minio/minio-go/pkg/s3signer"
|
"github.com/minio/minio-go/pkg/s3signer"
|
||||||
)
|
)
|
||||||
|
@ -135,9 +137,32 @@ func (c Client) makeBucketRequest(bucketName string, location string) (*http.Req
|
||||||
// set UserAgent for the request.
|
// set UserAgent for the request.
|
||||||
c.setUserAgent(req)
|
c.setUserAgent(req)
|
||||||
|
|
||||||
// set sha256 sum for signature calculation only with
|
// Get credentials from the configured credentials provider.
|
||||||
// signature version '4'.
|
value, err := c.credsProvider.Get()
|
||||||
if c.signature.isV4() {
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
signerType = value.SignerType
|
||||||
|
accessKeyID = value.AccessKeyID
|
||||||
|
secretAccessKey = value.SecretAccessKey
|
||||||
|
sessionToken = value.SessionToken
|
||||||
|
)
|
||||||
|
|
||||||
|
// Custom signer set then override the behavior.
|
||||||
|
if c.overrideSignerType != credentials.SignatureDefault {
|
||||||
|
signerType = c.overrideSignerType
|
||||||
|
}
|
||||||
|
|
||||||
|
// If signerType returned by credentials helper is anonymous,
|
||||||
|
// then do not sign regardless of signerType override.
|
||||||
|
if value.SignerType == credentials.SignatureAnonymous {
|
||||||
|
signerType = credentials.SignatureAnonymous
|
||||||
|
}
|
||||||
|
|
||||||
|
// set sha256 sum for signature calculation only with signature version '4'.
|
||||||
|
if signerType.IsV4() {
|
||||||
req.Header.Set("X-Amz-Content-Sha256", hex.EncodeToString(sum256([]byte{})))
|
req.Header.Set("X-Amz-Content-Sha256", hex.EncodeToString(sum256([]byte{})))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,19 +180,19 @@ func (c Client) makeBucketRequest(bucketName string, location string) (*http.Req
|
||||||
req.ContentLength = int64(len(createBucketConfigBytes))
|
req.ContentLength = int64(len(createBucketConfigBytes))
|
||||||
// Set content-md5.
|
// Set content-md5.
|
||||||
req.Header.Set("Content-Md5", base64.StdEncoding.EncodeToString(sumMD5(createBucketConfigBytes)))
|
req.Header.Set("Content-Md5", base64.StdEncoding.EncodeToString(sumMD5(createBucketConfigBytes)))
|
||||||
if c.signature.isV4() {
|
if signerType.IsV4() {
|
||||||
// Set sha256.
|
// Set sha256.
|
||||||
req.Header.Set("X-Amz-Content-Sha256", hex.EncodeToString(sum256(createBucketConfigBytes)))
|
req.Header.Set("X-Amz-Content-Sha256", hex.EncodeToString(sum256(createBucketConfigBytes)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sign the request.
|
// Sign the request.
|
||||||
if c.signature.isV4() {
|
if signerType.IsV4() {
|
||||||
// Signature calculated for MakeBucket request should be for 'us-east-1',
|
// Signature calculated for MakeBucket request should be for 'us-east-1',
|
||||||
// regardless of the bucket's location constraint.
|
// regardless of the bucket's location constraint.
|
||||||
req = s3signer.SignV4(*req, c.accessKeyID, c.secretAccessKey, "us-east-1")
|
req = s3signer.SignV4(*req, accessKeyID, secretAccessKey, sessionToken, "us-east-1")
|
||||||
} else if c.signature.isV2() {
|
} else if signerType.IsV2() {
|
||||||
req = s3signer.SignV2(*req, c.accessKeyID, c.secretAccessKey)
|
req = s3signer.SignV2(*req, accessKeyID, secretAccessKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return signed request.
|
// Return signed request.
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015, 2016 Minio, Inc.
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2015, 2016, 2017 Minio, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -27,6 +28,7 @@ import (
|
||||||
"path"
|
"path"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/minio/minio-go/pkg/credentials"
|
||||||
"github.com/minio/minio-go/pkg/s3signer"
|
"github.com/minio/minio-go/pkg/s3signer"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -48,8 +50,32 @@ func TestMakeBucketRequest(t *testing.T) {
|
||||||
// set UserAgent for the request.
|
// set UserAgent for the request.
|
||||||
c.setUserAgent(req)
|
c.setUserAgent(req)
|
||||||
|
|
||||||
|
// Get credentials from the configured credentials provider.
|
||||||
|
value, err := c.credsProvider.Get()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
signerType = value.SignerType
|
||||||
|
accessKeyID = value.AccessKeyID
|
||||||
|
secretAccessKey = value.SecretAccessKey
|
||||||
|
sessionToken = value.SessionToken
|
||||||
|
)
|
||||||
|
|
||||||
|
// Custom signer set then override the behavior.
|
||||||
|
if c.overrideSignerType != credentials.SignatureDefault {
|
||||||
|
signerType = c.overrideSignerType
|
||||||
|
}
|
||||||
|
|
||||||
|
// If signerType returned by credentials helper is anonymous,
|
||||||
|
// then do not sign regardless of signerType override.
|
||||||
|
if value.SignerType == credentials.SignatureAnonymous {
|
||||||
|
signerType = credentials.SignatureAnonymous
|
||||||
|
}
|
||||||
|
|
||||||
// set sha256 sum for signature calculation only with signature version '4'.
|
// set sha256 sum for signature calculation only with signature version '4'.
|
||||||
if c.signature.isV4() {
|
if signerType.IsV4() {
|
||||||
req.Header.Set("X-Amz-Content-Sha256", hex.EncodeToString(sum256([]byte{})))
|
req.Header.Set("X-Amz-Content-Sha256", hex.EncodeToString(sum256([]byte{})))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -67,19 +93,19 @@ func TestMakeBucketRequest(t *testing.T) {
|
||||||
req.ContentLength = int64(len(createBucketConfigBytes))
|
req.ContentLength = int64(len(createBucketConfigBytes))
|
||||||
// Set content-md5.
|
// Set content-md5.
|
||||||
req.Header.Set("Content-Md5", base64.StdEncoding.EncodeToString(sumMD5(createBucketConfigBytes)))
|
req.Header.Set("Content-Md5", base64.StdEncoding.EncodeToString(sumMD5(createBucketConfigBytes)))
|
||||||
if c.signature.isV4() {
|
if signerType.IsV4() {
|
||||||
// Set sha256.
|
// Set sha256.
|
||||||
req.Header.Set("X-Amz-Content-Sha256", hex.EncodeToString(sum256(createBucketConfigBytes)))
|
req.Header.Set("X-Amz-Content-Sha256", hex.EncodeToString(sum256(createBucketConfigBytes)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sign the request.
|
// Sign the request.
|
||||||
if c.signature.isV4() {
|
if signerType.IsV4() {
|
||||||
// Signature calculated for MakeBucket request should be for 'us-east-1',
|
// Signature calculated for MakeBucket request should be for 'us-east-1',
|
||||||
// regardless of the bucket's location constraint.
|
// regardless of the bucket's location constraint.
|
||||||
req = s3signer.SignV4(*req, c.accessKeyID, c.secretAccessKey, "us-east-1")
|
req = s3signer.SignV4(*req, accessKeyID, secretAccessKey, sessionToken, "us-east-1")
|
||||||
} else if c.signature.isV2() {
|
} else if signerType.IsV2() {
|
||||||
req = s3signer.SignV2(*req, c.accessKeyID, c.secretAccessKey)
|
req = s3signer.SignV2(*req, accessKeyID, secretAccessKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return signed request.
|
// Return signed request.
|
||||||
|
@ -246,7 +272,7 @@ func TestMakeBucketRequest(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if expectedReq.Header.Get("X-Amz-Content-Sha256") != actualReq.Header.Get("X-Amz-Content-Sha256") {
|
if expectedReq.Header.Get("X-Amz-Content-Sha256") != actualReq.Header.Get("X-Amz-Content-Sha256") {
|
||||||
t.Errorf("Test %d: 'X-Amz-Content-Sha256' header of the expected request doesn't match with that of the actual request", i+1)
|
t.Errorf("Test %d: 'X-Amz-Content-Sha256' header of the expected request %s doesn't match with that of the actual request %s", i+1, expectedReq.Header.Get("X-Amz-Content-Sha256"), actualReq.Header.Get("X-Amz-Content-Sha256"))
|
||||||
}
|
}
|
||||||
if expectedReq.Header.Get("User-Agent") != actualReq.Header.Get("User-Agent") {
|
if expectedReq.Header.Get("User-Agent") != actualReq.Header.Get("User-Agent") {
|
||||||
t.Errorf("Test %d: Expected 'User-Agent' header to be \"%s\",but found \"%s\" instead", i+1, expectedReq.Header.Get("User-Agent"), actualReq.Header.Get("User-Agent"))
|
t.Errorf("Test %d: Expected 'User-Agent' header to be \"%s\",but found \"%s\" instead", i+1, expectedReq.Header.Get("User-Agent"), actualReq.Header.Get("User-Agent"))
|
||||||
|
|
|
@ -157,13 +157,11 @@ func hashCopyN(hashAlgorithms map[string]hash.Hash, hashSums map[string][]byte,
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err == nil && size == partSize {
|
|
||||||
for k, v := range hashAlgorithms {
|
for k, v := range hashAlgorithms {
|
||||||
hashSums[k] = v.Sum(nil)
|
hashSums[k] = v.Sum(nil)
|
||||||
}
|
|
||||||
return size, nil
|
|
||||||
}
|
}
|
||||||
return 0, ErrUnexpectedEOF(size, partSize, "", "")
|
return size, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// getUploadID - fetch upload id if already present for an object name
|
// getUploadID - fetch upload id if already present for an object name
|
||||||
|
|
|
@ -182,7 +182,7 @@ func (c Client) putObjectMultipartFromFile(bucketName, objectName string, fileRe
|
||||||
hashAlgos := make(map[string]hash.Hash)
|
hashAlgos := make(map[string]hash.Hash)
|
||||||
hashSums := make(map[string][]byte)
|
hashSums := make(map[string][]byte)
|
||||||
hashAlgos["md5"] = md5.New()
|
hashAlgos["md5"] = md5.New()
|
||||||
if c.signature.isV4() && !c.secure {
|
if c.overrideSignerType.IsV4() && !c.secure {
|
||||||
hashAlgos["sha256"] = sha256.New()
|
hashAlgos["sha256"] = sha256.New()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -213,7 +213,7 @@ func (c Client) putObjectMultipartStream(bucketName, objectName string, reader i
|
||||||
hashSums := make(map[string][]byte)
|
hashSums := make(map[string][]byte)
|
||||||
hashAlgos := make(map[string]hash.Hash)
|
hashAlgos := make(map[string]hash.Hash)
|
||||||
hashAlgos["md5"] = md5.New()
|
hashAlgos["md5"] = md5.New()
|
||||||
if c.signature.isV4() && !c.secure {
|
if c.overrideSignerType.IsV4() && !c.secure {
|
||||||
hashAlgos["sha256"] = sha256.New()
|
hashAlgos["sha256"] = sha256.New()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@ import (
|
||||||
"io"
|
"io"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/minio/minio-go/pkg/credentials"
|
||||||
"github.com/minio/minio-go/pkg/encrypt"
|
"github.com/minio/minio-go/pkg/encrypt"
|
||||||
"github.com/minio/minio-go/pkg/s3utils"
|
"github.com/minio/minio-go/pkg/s3utils"
|
||||||
)
|
)
|
||||||
|
@ -103,6 +104,7 @@ func (c Client) PutObjectWithMetadata(bucketName, objectName string, reader io.R
|
||||||
if size < minPartSize && size >= 0 {
|
if size < minPartSize && size >= 0 {
|
||||||
return c.putObjectSingle(bucketName, objectName, reader, size, metaData, progress)
|
return c.putObjectSingle(bucketName, objectName, reader, size, metaData, progress)
|
||||||
}
|
}
|
||||||
|
|
||||||
// For all sizes greater than 5MiB do multipart.
|
// For all sizes greater than 5MiB do multipart.
|
||||||
n, err = c.putObjectMultipart(bucketName, objectName, reader, size, metaData, progress)
|
n, err = c.putObjectMultipart(bucketName, objectName, reader, size, metaData, progress)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -143,8 +145,8 @@ func (c Client) PutObjectStreamingWithProgress(bucketName, objectName string, re
|
||||||
BucketName: bucketName,
|
BucketName: bucketName,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// This method should return error with signature v2 minioClient.
|
|
||||||
if c.signature.isV2() {
|
if c.overrideSignerType.IsV2() {
|
||||||
return 0, ErrorResponse{
|
return 0, ErrorResponse{
|
||||||
Code: "NotImplemented",
|
Code: "NotImplemented",
|
||||||
Message: "AWS streaming signature v4 is not supported with minio client initialized for AWS signature v2",
|
Message: "AWS streaming signature v4 is not supported with minio client initialized for AWS signature v2",
|
||||||
|
@ -173,8 +175,8 @@ func (c Client) PutObjectStreamingWithProgress(bucketName, objectName string, re
|
||||||
return c.putObjectMultipartStream(bucketName, objectName, reader, size, metadata, progress)
|
return c.putObjectMultipartStream(bucketName, objectName, reader, size, metadata, progress)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set signature type to streaming signature v4.
|
// Set streaming signature.
|
||||||
c.signature = SignatureV4Streaming
|
c.overrideSignerType = credentials.SignatureV4Streaming
|
||||||
|
|
||||||
if size < minPartSize && size >= 0 {
|
if size < minPartSize && size >= 0 {
|
||||||
return c.putObjectNoChecksum(bucketName, objectName, reader, size, metadata, progress)
|
return c.putObjectNoChecksum(bucketName, objectName, reader, size, metadata, progress)
|
||||||
|
|
|
@ -146,7 +146,7 @@ func (c Client) putObjectMultipartFromReadAt(bucketName, objectName string, read
|
||||||
hashSums := make(map[string][]byte)
|
hashSums := make(map[string][]byte)
|
||||||
hashAlgos := make(map[string]hash.Hash)
|
hashAlgos := make(map[string]hash.Hash)
|
||||||
hashAlgos["md5"] = md5.New()
|
hashAlgos["md5"] = md5.New()
|
||||||
if c.signature.isV4() && !c.secure {
|
if c.overrideSignerType.IsV4() && !c.secure {
|
||||||
hashAlgos["sha256"] = sha256.New()
|
hashAlgos["sha256"] = sha256.New()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -109,14 +109,24 @@ func getReaderSize(reader io.Reader) (size int64, err error) {
|
||||||
case "|0", "|1":
|
case "|0", "|1":
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
size = st.Size()
|
var pos int64
|
||||||
|
pos, err = v.Seek(0, 1) // SeekCurrent.
|
||||||
|
if err != nil {
|
||||||
|
return -1, err
|
||||||
|
}
|
||||||
|
size = st.Size() - pos
|
||||||
case *Object:
|
case *Object:
|
||||||
var st ObjectInfo
|
var st ObjectInfo
|
||||||
st, err = v.Stat()
|
st, err = v.Stat()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
size = st.Size
|
var pos int64
|
||||||
|
pos, err = v.Seek(0, 1) // SeekCurrent.
|
||||||
|
if err != nil {
|
||||||
|
return -1, err
|
||||||
|
}
|
||||||
|
size = st.Size - pos
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Returns the size here.
|
// Returns the size here.
|
||||||
|
@ -200,7 +210,7 @@ func (c Client) putObjectSingle(bucketName, objectName string, reader io.Reader,
|
||||||
hashAlgos := make(map[string]hash.Hash)
|
hashAlgos := make(map[string]hash.Hash)
|
||||||
hashSums := make(map[string][]byte)
|
hashSums := make(map[string][]byte)
|
||||||
hashAlgos["md5"] = md5.New()
|
hashAlgos["md5"] = md5.New()
|
||||||
if c.signature.isV4() && !c.secure {
|
if c.overrideSignerType.IsV4() && !c.secure {
|
||||||
hashAlgos["sha256"] = sha256.New()
|
hashAlgos["sha256"] = sha256.New()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
156
vendor/src/github.com/minio/minio-go/api.go
vendored
156
vendor/src/github.com/minio/minio-go/api.go
vendored
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015, 2016 Minio, Inc.
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2015, 2016, 2017 Minio, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -35,6 +36,7 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/minio/minio-go/pkg/credentials"
|
||||||
"github.com/minio/minio-go/pkg/s3signer"
|
"github.com/minio/minio-go/pkg/s3signer"
|
||||||
"github.com/minio/minio-go/pkg/s3utils"
|
"github.com/minio/minio-go/pkg/s3utils"
|
||||||
)
|
)
|
||||||
|
@ -46,14 +48,11 @@ type Client struct {
|
||||||
// Parsed endpoint url provided by the user.
|
// Parsed endpoint url provided by the user.
|
||||||
endpointURL url.URL
|
endpointURL url.URL
|
||||||
|
|
||||||
// AccessKeyID required for authorized requests.
|
// Holds various credential providers.
|
||||||
accessKeyID string
|
credsProvider *credentials.Credentials
|
||||||
// SecretAccessKey required for authorized requests.
|
|
||||||
secretAccessKey string
|
// Custom signerType value overrides all credentials.
|
||||||
// Choose a signature type if necessary.
|
overrideSignerType credentials.SignatureType
|
||||||
signature SignatureType
|
|
||||||
// Set to 'true' if Client has no access and secret keys.
|
|
||||||
anonymous bool
|
|
||||||
|
|
||||||
// User supplied.
|
// User supplied.
|
||||||
appInfo struct {
|
appInfo struct {
|
||||||
|
@ -100,58 +99,58 @@ const (
|
||||||
// NewV2 - instantiate minio client with Amazon S3 signature version
|
// NewV2 - instantiate minio client with Amazon S3 signature version
|
||||||
// '2' compatibility.
|
// '2' compatibility.
|
||||||
func NewV2(endpoint string, accessKeyID, secretAccessKey string, secure bool) (*Client, error) {
|
func NewV2(endpoint string, accessKeyID, secretAccessKey string, secure bool) (*Client, error) {
|
||||||
clnt, err := privateNew(endpoint, accessKeyID, secretAccessKey, secure)
|
creds := credentials.NewStaticV2(accessKeyID, secretAccessKey, "")
|
||||||
|
clnt, err := privateNew(endpoint, creds, secure, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
clnt.overrideSignerType = credentials.SignatureV2
|
||||||
// Set to use signature version '2'.
|
|
||||||
clnt.signature = SignatureV2
|
|
||||||
return clnt, nil
|
return clnt, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewV4 - instantiate minio client with Amazon S3 signature version
|
// NewV4 - instantiate minio client with Amazon S3 signature version
|
||||||
// '4' compatibility.
|
// '4' compatibility.
|
||||||
func NewV4(endpoint string, accessKeyID, secretAccessKey string, secure bool) (*Client, error) {
|
func NewV4(endpoint string, accessKeyID, secretAccessKey string, secure bool) (*Client, error) {
|
||||||
clnt, err := privateNew(endpoint, accessKeyID, secretAccessKey, secure)
|
creds := credentials.NewStaticV4(accessKeyID, secretAccessKey, "")
|
||||||
|
clnt, err := privateNew(endpoint, creds, secure, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
clnt.overrideSignerType = credentials.SignatureV4
|
||||||
// Set to use signature version '4'.
|
|
||||||
clnt.signature = SignatureV4
|
|
||||||
return clnt, nil
|
return clnt, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// New - instantiate minio client Client, adds automatic verification of signature.
|
// New - instantiate minio client, adds automatic verification of signature.
|
||||||
func New(endpoint, accessKeyID, secretAccessKey string, secure bool) (*Client, error) {
|
func New(endpoint, accessKeyID, secretAccessKey string, secure bool) (*Client, error) {
|
||||||
return NewWithRegion(endpoint, accessKeyID, secretAccessKey, secure, "")
|
creds := credentials.NewStaticV4(accessKeyID, secretAccessKey, "")
|
||||||
|
clnt, err := privateNew(endpoint, creds, secure, "")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
// Google cloud storage should be set to signature V2, force it if not.
|
||||||
|
if s3utils.IsGoogleEndpoint(clnt.endpointURL) {
|
||||||
|
clnt.overrideSignerType = credentials.SignatureV2
|
||||||
|
}
|
||||||
|
// If Amazon S3 set to signature v4.
|
||||||
|
if s3utils.IsAmazonEndpoint(clnt.endpointURL) {
|
||||||
|
clnt.overrideSignerType = credentials.SignatureV4
|
||||||
|
}
|
||||||
|
return clnt, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewWithCredentials - instantiate minio client with credentials provider
|
||||||
|
// for retrieving credentials from various credentials provider such as
|
||||||
|
// IAM, File, Env etc.
|
||||||
|
func NewWithCredentials(endpoint string, creds *credentials.Credentials, secure bool, region string) (*Client, error) {
|
||||||
|
return privateNew(endpoint, creds, secure, region)
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewWithRegion - instantiate minio client, with region configured. Unlike New(),
|
// NewWithRegion - instantiate minio client, with region configured. Unlike New(),
|
||||||
// NewWithRegion avoids bucket-location lookup operations and it is slightly faster.
|
// NewWithRegion avoids bucket-location lookup operations and it is slightly faster.
|
||||||
// Use this function when if your application deals with single region.
|
// Use this function when if your application deals with single region.
|
||||||
func NewWithRegion(endpoint, accessKeyID, secretAccessKey string, secure bool, region string) (*Client, error) {
|
func NewWithRegion(endpoint, accessKeyID, secretAccessKey string, secure bool, region string) (*Client, error) {
|
||||||
clnt, err := privateNew(endpoint, accessKeyID, secretAccessKey, secure)
|
creds := credentials.NewStaticV4(accessKeyID, secretAccessKey, "")
|
||||||
if err != nil {
|
return privateNew(endpoint, creds, secure, region)
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Google cloud storage should be set to signature V2, force it if not.
|
|
||||||
if s3utils.IsGoogleEndpoint(clnt.endpointURL) {
|
|
||||||
clnt.signature = SignatureV2
|
|
||||||
}
|
|
||||||
|
|
||||||
// If Amazon S3 set to signature v2.n
|
|
||||||
if s3utils.IsAmazonEndpoint(clnt.endpointURL) {
|
|
||||||
clnt.signature = SignatureV4
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sets custom region, if region is empty bucket location cache is used automatically.
|
|
||||||
clnt.region = region
|
|
||||||
|
|
||||||
// Success..
|
|
||||||
return clnt, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// lockedRandSource provides protected rand source, implements rand.Source interface.
|
// lockedRandSource provides protected rand source, implements rand.Source interface.
|
||||||
|
@ -188,7 +187,7 @@ func redirectHeaders(req *http.Request, via []*http.Request) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func privateNew(endpoint, accessKeyID, secretAccessKey string, secure bool) (*Client, error) {
|
func privateNew(endpoint string, creds *credentials.Credentials, secure bool, region string) (*Client, error) {
|
||||||
// construct endpoint.
|
// construct endpoint.
|
||||||
endpointURL, err := getEndpointURL(endpoint, secure)
|
endpointURL, err := getEndpointURL(endpoint, secure)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -197,8 +196,9 @@ func privateNew(endpoint, accessKeyID, secretAccessKey string, secure bool) (*Cl
|
||||||
|
|
||||||
// instantiate new Client.
|
// instantiate new Client.
|
||||||
clnt := new(Client)
|
clnt := new(Client)
|
||||||
clnt.accessKeyID = accessKeyID
|
|
||||||
clnt.secretAccessKey = secretAccessKey
|
// Save the credentials.
|
||||||
|
clnt.credsProvider = creds
|
||||||
|
|
||||||
// Remember whether we are using https or not
|
// Remember whether we are using https or not
|
||||||
clnt.secure = secure
|
clnt.secure = secure
|
||||||
|
@ -212,7 +212,10 @@ func privateNew(endpoint, accessKeyID, secretAccessKey string, secure bool) (*Cl
|
||||||
CheckRedirect: redirectHeaders,
|
CheckRedirect: redirectHeaders,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Instantiae bucket location cache.
|
// Sets custom region, if region is empty bucket location cache is used automatically.
|
||||||
|
clnt.region = region
|
||||||
|
|
||||||
|
// Instantiate bucket location cache.
|
||||||
clnt.bucketLocCache = newBucketLocationCache()
|
clnt.bucketLocCache = newBucketLocationCache()
|
||||||
|
|
||||||
// Introduce a new locked random seed.
|
// Introduce a new locked random seed.
|
||||||
|
@ -314,11 +317,12 @@ var regSign = regexp.MustCompile("Signature=([[0-9a-f]+)")
|
||||||
|
|
||||||
// Filter out signature value from Authorization header.
|
// Filter out signature value from Authorization header.
|
||||||
func (c Client) filterSignature(req *http.Request) {
|
func (c Client) filterSignature(req *http.Request) {
|
||||||
if _, ok := req.Header["Authorization"]; !ok {
|
origAuth := req.Header.Get("Authorization")
|
||||||
|
if origAuth != "" {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Handle if Signature V2.
|
|
||||||
if c.signature.isV2() {
|
if !strings.HasPrefix(origAuth, signV4Algorithm) {
|
||||||
// Set a temporary redacted auth
|
// Set a temporary redacted auth
|
||||||
req.Header.Set("Authorization", "AWS **REDACTED**:**REDACTED**")
|
req.Header.Set("Authorization", "AWS **REDACTED**:**REDACTED**")
|
||||||
return
|
return
|
||||||
|
@ -326,8 +330,6 @@ func (c Client) filterSignature(req *http.Request) {
|
||||||
|
|
||||||
/// Signature V4 authorization header.
|
/// Signature V4 authorization header.
|
||||||
|
|
||||||
// Save the original auth.
|
|
||||||
origAuth := req.Header.Get("Authorization")
|
|
||||||
// Strip out accessKeyID from:
|
// Strip out accessKeyID from:
|
||||||
// Credential=<access-key-id>/<date>/<aws-region>/<aws-service>/aws4_request
|
// Credential=<access-key-id>/<date>/<aws-region>/<aws-service>/aws4_request
|
||||||
newAuth := regCred.ReplaceAllString(origAuth, "Credential=**REDACTED**/")
|
newAuth := regCred.ReplaceAllString(origAuth, "Credential=**REDACTED**/")
|
||||||
|
@ -337,6 +339,7 @@ func (c Client) filterSignature(req *http.Request) {
|
||||||
|
|
||||||
// Set a temporary redacted auth
|
// Set a temporary redacted auth
|
||||||
req.Header.Set("Authorization", newAuth)
|
req.Header.Set("Authorization", newAuth)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -614,20 +617,41 @@ func (c Client) newRequest(method string, metadata requestMetadata) (req *http.R
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Anonymous request.
|
// Get credentials from the configured credentials provider.
|
||||||
anonymous := c.accessKeyID == "" || c.secretAccessKey == ""
|
value, err := c.credsProvider.Get()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
signerType = value.SignerType
|
||||||
|
accessKeyID = value.AccessKeyID
|
||||||
|
secretAccessKey = value.SecretAccessKey
|
||||||
|
sessionToken = value.SessionToken
|
||||||
|
)
|
||||||
|
|
||||||
|
// Custom signer set then override the behavior.
|
||||||
|
if c.overrideSignerType != credentials.SignatureDefault {
|
||||||
|
signerType = c.overrideSignerType
|
||||||
|
}
|
||||||
|
|
||||||
|
// If signerType returned by credentials helper is anonymous,
|
||||||
|
// then do not sign regardless of signerType override.
|
||||||
|
if value.SignerType == credentials.SignatureAnonymous {
|
||||||
|
signerType = credentials.SignatureAnonymous
|
||||||
|
}
|
||||||
|
|
||||||
// Generate presign url if needed, return right here.
|
// Generate presign url if needed, return right here.
|
||||||
if metadata.expires != 0 && metadata.presignURL {
|
if metadata.expires != 0 && metadata.presignURL {
|
||||||
if anonymous {
|
if signerType.IsAnonymous() {
|
||||||
return nil, ErrInvalidArgument("Requests cannot be presigned with anonymous credentials.")
|
return nil, ErrInvalidArgument("Presigned URLs cannot be generated with anonymous credentials.")
|
||||||
}
|
}
|
||||||
if c.signature.isV2() {
|
if signerType.IsV2() {
|
||||||
// Presign URL with signature v2.
|
// Presign URL with signature v2.
|
||||||
req = s3signer.PreSignV2(*req, c.accessKeyID, c.secretAccessKey, metadata.expires)
|
req = s3signer.PreSignV2(*req, accessKeyID, secretAccessKey, metadata.expires)
|
||||||
} else if c.signature.isV4() {
|
} else if signerType.IsV4() {
|
||||||
// Presign URL with signature v4.
|
// Presign URL with signature v4.
|
||||||
req = s3signer.PreSignV4(*req, c.accessKeyID, c.secretAccessKey, location, metadata.expires)
|
req = s3signer.PreSignV4(*req, accessKeyID, secretAccessKey, sessionToken, location, metadata.expires)
|
||||||
}
|
}
|
||||||
return req, nil
|
return req, nil
|
||||||
}
|
}
|
||||||
|
@ -650,17 +674,18 @@ func (c Client) newRequest(method string, metadata requestMetadata) (req *http.R
|
||||||
req.Header.Set("Content-Md5", base64.StdEncoding.EncodeToString(metadata.contentMD5Bytes))
|
req.Header.Set("Content-Md5", base64.StdEncoding.EncodeToString(metadata.contentMD5Bytes))
|
||||||
}
|
}
|
||||||
|
|
||||||
if anonymous {
|
// For anonymous requests just return.
|
||||||
|
if signerType.IsAnonymous() {
|
||||||
return req, nil
|
return req, nil
|
||||||
} // Sign the request for all authenticated requests.
|
}
|
||||||
|
|
||||||
switch {
|
switch {
|
||||||
case c.signature.isV2():
|
case signerType.IsV2():
|
||||||
// Add signature version '2' authorization header.
|
// Add signature version '2' authorization header.
|
||||||
req = s3signer.SignV2(*req, c.accessKeyID, c.secretAccessKey)
|
req = s3signer.SignV2(*req, accessKeyID, secretAccessKey)
|
||||||
case c.signature.isStreamingV4() && method == "PUT":
|
case signerType.IsStreamingV4() && method == "PUT":
|
||||||
req = s3signer.StreamingSignV4(req, c.accessKeyID,
|
req = s3signer.StreamingSignV4(req, accessKeyID,
|
||||||
c.secretAccessKey, location, metadata.contentLength, time.Now().UTC())
|
secretAccessKey, sessionToken, location, metadata.contentLength, time.Now().UTC())
|
||||||
default:
|
default:
|
||||||
// Set sha256 sum for signature calculation only with signature version '4'.
|
// Set sha256 sum for signature calculation only with signature version '4'.
|
||||||
shaHeader := unsignedPayload
|
shaHeader := unsignedPayload
|
||||||
|
@ -670,7 +695,7 @@ func (c Client) newRequest(method string, metadata requestMetadata) (req *http.R
|
||||||
req.Header.Set("X-Amz-Content-Sha256", shaHeader)
|
req.Header.Set("X-Amz-Content-Sha256", shaHeader)
|
||||||
|
|
||||||
// Add signature version '4' authorization header.
|
// Add signature version '4' authorization header.
|
||||||
req = s3signer.SignV4(*req, c.accessKeyID, c.secretAccessKey, location)
|
req = s3signer.SignV4(*req, accessKeyID, secretAccessKey, sessionToken, location)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return request.
|
// Return request.
|
||||||
|
@ -732,13 +757,16 @@ func (c Client) makeTargetURL(bucketName, objectName, bucketLocation string, que
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there are any query values, add them to the end.
|
// If there are any query values, add them to the end.
|
||||||
if len(queryValues) > 0 {
|
if len(queryValues) > 0 {
|
||||||
urlStr = urlStr + "?" + s3utils.QueryEncode(queryValues)
|
urlStr = urlStr + "?" + s3utils.QueryEncode(queryValues)
|
||||||
}
|
}
|
||||||
|
|
||||||
u, err := url.Parse(urlStr)
|
u, err := url.Parse(urlStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return u, nil
|
return u, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,6 @@ package minio
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
crand "crypto/rand"
|
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
@ -201,14 +200,10 @@ func TestPutObjectReadAt(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate data using 4 parts so that all 3 'workers' are utilized and a part is leftover.
|
// Generate data using 4 parts so that all 3 'workers' are utilized and a part is leftover.
|
||||||
buf := make([]byte, minPartSize*4)
|
// Use different data for each part for multipart tests to ensure part order at the end.
|
||||||
// Use crand.Reader for multipart tests to ensure part order at the end.
|
var buf []byte
|
||||||
size, err := io.ReadFull(crand.Reader, buf)
|
for i := 0; i < 4; i++ {
|
||||||
if err != nil {
|
buf = append(buf, bytes.Repeat([]byte(string('a'+i)), minPartSize)...)
|
||||||
t.Fatal("Error:", err)
|
|
||||||
}
|
|
||||||
if size != minPartSize*4 {
|
|
||||||
t.Fatalf("Error: number of bytes does not match, want %v, got %v\n", minPartSize*4, size)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save the data
|
// Save the data
|
||||||
|
@ -295,14 +290,10 @@ func TestPutObjectWithMetadata(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate data using 2 parts
|
// Generate data using 2 parts
|
||||||
buf := make([]byte, minPartSize*2)
|
// Use different data in each part for multipart tests to ensure part order at the end.
|
||||||
// Use crand.Reader for multipart tests to ensure part order at the end.
|
var buf []byte
|
||||||
size, err := io.ReadFull(crand.Reader, buf)
|
for i := 0; i < 2; i++ {
|
||||||
if err != nil {
|
buf = append(buf, bytes.Repeat([]byte(string('a'+i)), minPartSize)...)
|
||||||
t.Fatal("Error:", err)
|
|
||||||
}
|
|
||||||
if size != minPartSize*2 {
|
|
||||||
t.Fatalf("Error: number of bytes does not match, want %v, got %v\n", minPartSize*2, size)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save the data
|
// Save the data
|
||||||
|
@ -856,7 +847,6 @@ func TestResumablePutObject(t *testing.T) {
|
||||||
t.Fatal("Error:", err)
|
t.Fatal("Error:", err)
|
||||||
}
|
}
|
||||||
r := bytes.NewReader(bytes.Repeat([]byte("b"), minPartSize*2))
|
r := bytes.NewReader(bytes.Repeat([]byte("b"), minPartSize*2))
|
||||||
// Copy 11MiB worth of random data.
|
|
||||||
n, err := io.CopyN(file, r, minPartSize*2)
|
n, err := io.CopyN(file, r, minPartSize*2)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal("Error:", err)
|
t.Fatal("Error:", err)
|
||||||
|
@ -972,16 +962,13 @@ func TestResumableFPutObject(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Upload 4 parts to use all 3 multipart 'workers' and have an extra part.
|
// Upload 4 parts to use all 3 multipart 'workers' and have an extra part.
|
||||||
buffer := make([]byte, minPartSize*4)
|
// Use different data in each part for multipart tests to ensure parts are uploaded in correct order.
|
||||||
// Use crand.Reader for multipart tests to ensure parts are uploaded in correct order.
|
var buffer []byte
|
||||||
size, err := io.ReadFull(crand.Reader, buffer)
|
for i := 0; i < 4; i++ {
|
||||||
if err != nil {
|
buffer = append(buffer, bytes.Repeat([]byte(string('a'+i)), minPartSize)...)
|
||||||
t.Fatal("Error:", err)
|
|
||||||
}
|
}
|
||||||
if size != minPartSize*4 {
|
|
||||||
t.Fatalf("Error: number of bytes does not match, want %v, got %v\n", minPartSize*4, size)
|
size, err := file.Write(buffer)
|
||||||
}
|
|
||||||
size, err = file.Write(buffer)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal("Error:", err)
|
t.Fatal("Error:", err)
|
||||||
}
|
}
|
||||||
|
@ -1063,16 +1050,12 @@ func TestFPutObjectMultipart(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Upload 4 parts to utilize all 3 'workers' in multipart and still have a part to upload.
|
// Upload 4 parts to utilize all 3 'workers' in multipart and still have a part to upload.
|
||||||
buffer := make([]byte, minPartSize*4)
|
var buffer []byte
|
||||||
|
for i := 0; i < 4; i++ {
|
||||||
|
buffer = append(buffer, bytes.Repeat([]byte(string('a'+i)), minPartSize)...)
|
||||||
|
}
|
||||||
|
|
||||||
size, err := io.ReadFull(crand.Reader, buffer)
|
size, err := file.Write(buffer)
|
||||||
if err != nil {
|
|
||||||
t.Fatal("Error:", err)
|
|
||||||
}
|
|
||||||
if size != minPartSize*4 {
|
|
||||||
t.Fatalf("Error: number of bytes does not match, want %v, got %v\n", minPartSize*4, size)
|
|
||||||
}
|
|
||||||
size, err = file.Write(buffer)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal("Error:", err)
|
t.Fatal("Error:", err)
|
||||||
}
|
}
|
||||||
|
@ -1168,18 +1151,14 @@ func TestFPutObject(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Upload 4 parts worth of data to use all 3 of multiparts 'workers' and have an extra part.
|
// Upload 4 parts worth of data to use all 3 of multiparts 'workers' and have an extra part.
|
||||||
buffer := make([]byte, minPartSize*4)
|
// Use different data in part for multipart tests to check parts are uploaded in correct order.
|
||||||
// Use random data for multipart tests to check parts are uploaded in correct order.
|
var buffer []byte
|
||||||
size, err := io.ReadFull(crand.Reader, buffer)
|
for i := 0; i < 4; i++ {
|
||||||
if err != nil {
|
buffer = append(buffer, bytes.Repeat([]byte(string('a'+i)), minPartSize)...)
|
||||||
t.Fatal("Error:", err)
|
|
||||||
}
|
|
||||||
if size != minPartSize*4 {
|
|
||||||
t.Fatalf("Error: number of bytes does not match, want %v, got %v\n", minPartSize*4, size)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write the data to the file.
|
// Write the data to the file.
|
||||||
size, err = file.Write(buffer)
|
size, err := file.Write(buffer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal("Error:", err)
|
t.Fatal("Error:", err)
|
||||||
}
|
}
|
||||||
|
@ -2498,3 +2477,97 @@ func TestGetObjectObjectModified(t *testing.T) {
|
||||||
t.Errorf("Expected ReadAt to fail with error %s but received %s", s3ErrorResponseMap["PreconditionFailed"], err.Error())
|
t.Errorf("Expected ReadAt to fail with error %s but received %s", s3ErrorResponseMap["PreconditionFailed"], err.Error())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Test validates putObject to upload a file seeked at a given offset.
|
||||||
|
func TestPutObjectUploadSeekedObject(t *testing.T) {
|
||||||
|
if testing.Short() {
|
||||||
|
t.Skip("skipping functional tests for the short runs")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Instantiate new minio client object.
|
||||||
|
c, err := NewV4(
|
||||||
|
os.Getenv("S3_ADDRESS"),
|
||||||
|
os.Getenv("ACCESS_KEY"),
|
||||||
|
os.Getenv("SECRET_KEY"),
|
||||||
|
mustParseBool(os.Getenv("S3_SECURE")),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Error:", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enable tracing, write to stderr.
|
||||||
|
// c.TraceOn(os.Stderr)
|
||||||
|
|
||||||
|
// Set user agent.
|
||||||
|
c.SetAppInfo("Minio-go-FunctionalTest", "0.1.0")
|
||||||
|
|
||||||
|
// Make a new bucket.
|
||||||
|
bucketName := randString(60, rand.NewSource(time.Now().UnixNano()), "minio-go-test")
|
||||||
|
err = c.MakeBucket(bucketName, "us-east-1")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Error:", err, bucketName)
|
||||||
|
}
|
||||||
|
defer c.RemoveBucket(bucketName)
|
||||||
|
|
||||||
|
tempfile, err := ioutil.TempFile("", "minio-go-upload-test-")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Error:", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var length = 120000
|
||||||
|
data := bytes.Repeat([]byte("1"), length)
|
||||||
|
|
||||||
|
if _, err = tempfile.Write(data); err != nil {
|
||||||
|
t.Fatal("Error:", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
objectName := fmt.Sprintf("test-file-%v", rand.Uint32())
|
||||||
|
|
||||||
|
offset := length / 2
|
||||||
|
if _, err := tempfile.Seek(int64(offset), 0); err != nil {
|
||||||
|
t.Fatal("Error:", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
n, err := c.PutObject(bucketName, objectName, tempfile, "binary/octet-stream")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Error:", err)
|
||||||
|
}
|
||||||
|
if n != int64(length-offset) {
|
||||||
|
t.Fatalf("Invalid length returned, want %v, got %v", int64(length-offset), n)
|
||||||
|
}
|
||||||
|
tempfile.Close()
|
||||||
|
if err = os.Remove(tempfile.Name()); err != nil {
|
||||||
|
t.Fatal("Error:", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
length = int(n)
|
||||||
|
|
||||||
|
obj, err := c.GetObject(bucketName, objectName)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Error:", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
n, err = obj.Seek(int64(offset), 0)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Error:", err)
|
||||||
|
}
|
||||||
|
if n != int64(offset) {
|
||||||
|
t.Fatalf("Invalid offset returned, want %v, got %v", int64(offset), n)
|
||||||
|
}
|
||||||
|
|
||||||
|
n, err = c.PutObject(bucketName, objectName+"getobject", obj, "binary/octet-stream")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("Error:", err)
|
||||||
|
}
|
||||||
|
if n != int64(length-offset) {
|
||||||
|
t.Fatalf("Invalid length returned, want %v, got %v", int64(length-offset), n)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = c.RemoveObject(bucketName, objectName); err != nil {
|
||||||
|
t.Fatal("Error:", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = c.RemoveObject(bucketName, objectName+"getobject"); err != nil {
|
||||||
|
t.Fatal("Error:", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2015, 2016, 2017 Minio, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -25,6 +26,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/minio/minio-go/pkg/credentials"
|
||||||
"github.com/minio/minio-go/pkg/policy"
|
"github.com/minio/minio-go/pkg/policy"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -228,18 +230,18 @@ func TestErrorResponse(t *testing.T) {
|
||||||
// Tests signature type.
|
// Tests signature type.
|
||||||
func TestSignatureType(t *testing.T) {
|
func TestSignatureType(t *testing.T) {
|
||||||
clnt := Client{}
|
clnt := Client{}
|
||||||
if !clnt.signature.isV4() {
|
if !clnt.overrideSignerType.IsV4() {
|
||||||
t.Fatal("Error")
|
t.Fatal("Error")
|
||||||
}
|
}
|
||||||
clnt.signature = SignatureV2
|
clnt.overrideSignerType = credentials.SignatureV2
|
||||||
if !clnt.signature.isV2() {
|
if !clnt.overrideSignerType.IsV2() {
|
||||||
t.Fatal("Error")
|
t.Fatal("Error")
|
||||||
}
|
}
|
||||||
if clnt.signature.isV4() {
|
if clnt.overrideSignerType.IsV4() {
|
||||||
t.Fatal("Error")
|
t.Fatal("Error")
|
||||||
}
|
}
|
||||||
clnt.signature = SignatureV4
|
clnt.overrideSignerType = credentials.SignatureV4
|
||||||
if !clnt.signature.isV4() {
|
if !clnt.overrideSignerType.IsV4() {
|
||||||
t.Fatal("Error")
|
t.Fatal("Error")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,8 @@ install:
|
||||||
- go version
|
- go version
|
||||||
- go env
|
- go env
|
||||||
- go get -u github.com/golang/lint/golint
|
- go get -u github.com/golang/lint/golint
|
||||||
|
- go get -u github.com/go-ini/ini
|
||||||
|
- go get -u github.com/minio/go-homedir
|
||||||
- go get -u github.com/remyoudompheng/go-misc/deadcode
|
- go get -u github.com/remyoudompheng/go-misc/deadcode
|
||||||
- go get -u github.com/gordonklaus/ineffassign
|
- go get -u github.com/gordonklaus/ineffassign
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2015, 2016, 2017 Minio, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -23,6 +24,7 @@ import (
|
||||||
"path"
|
"path"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
|
"github.com/minio/minio-go/pkg/credentials"
|
||||||
"github.com/minio/minio-go/pkg/s3signer"
|
"github.com/minio/minio-go/pkg/s3signer"
|
||||||
"github.com/minio/minio-go/pkg/s3utils"
|
"github.com/minio/minio-go/pkg/s3utils"
|
||||||
)
|
)
|
||||||
|
@ -181,8 +183,33 @@ func (c Client) getBucketLocationRequest(bucketName string) (*http.Request, erro
|
||||||
// Set UserAgent for the request.
|
// Set UserAgent for the request.
|
||||||
c.setUserAgent(req)
|
c.setUserAgent(req)
|
||||||
|
|
||||||
|
// Get credentials from the configured credentials provider.
|
||||||
|
value, err := c.credsProvider.Get()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
signerType = value.SignerType
|
||||||
|
accessKeyID = value.AccessKeyID
|
||||||
|
secretAccessKey = value.SecretAccessKey
|
||||||
|
sessionToken = value.SessionToken
|
||||||
|
)
|
||||||
|
|
||||||
|
// Custom signer set then override the behavior.
|
||||||
|
if c.overrideSignerType != credentials.SignatureDefault {
|
||||||
|
signerType = c.overrideSignerType
|
||||||
|
}
|
||||||
|
|
||||||
|
// If signerType returned by credentials helper is anonymous,
|
||||||
|
// then do not sign regardless of signerType override.
|
||||||
|
if value.SignerType == credentials.SignatureAnonymous {
|
||||||
|
signerType = credentials.SignatureAnonymous
|
||||||
|
}
|
||||||
|
|
||||||
// Set sha256 sum for signature calculation only with signature version '4'.
|
// Set sha256 sum for signature calculation only with signature version '4'.
|
||||||
if c.signature.isV4() {
|
switch {
|
||||||
|
case signerType.IsV4():
|
||||||
var contentSha256 string
|
var contentSha256 string
|
||||||
if c.secure {
|
if c.secure {
|
||||||
contentSha256 = unsignedPayload
|
contentSha256 = unsignedPayload
|
||||||
|
@ -190,13 +217,10 @@ func (c Client) getBucketLocationRequest(bucketName string) (*http.Request, erro
|
||||||
contentSha256 = hex.EncodeToString(sum256([]byte{}))
|
contentSha256 = hex.EncodeToString(sum256([]byte{}))
|
||||||
}
|
}
|
||||||
req.Header.Set("X-Amz-Content-Sha256", contentSha256)
|
req.Header.Set("X-Amz-Content-Sha256", contentSha256)
|
||||||
|
req = s3signer.SignV4(*req, accessKeyID, secretAccessKey, sessionToken, "us-east-1")
|
||||||
|
case signerType.IsV2():
|
||||||
|
req = s3signer.SignV2(*req, accessKeyID, secretAccessKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sign the request.
|
|
||||||
if c.signature.isV4() {
|
|
||||||
req = s3signer.SignV4(*req, c.accessKeyID, c.secretAccessKey, "us-east-1")
|
|
||||||
} else if c.signature.isV2() {
|
|
||||||
req = s3signer.SignV2(*req, c.accessKeyID, c.secretAccessKey)
|
|
||||||
}
|
|
||||||
return req, nil
|
return req, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2016, 2016 Minio, Inc.
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2015, 2016, 2017 Minio, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -27,6 +28,7 @@ import (
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/minio/minio-go/pkg/credentials"
|
||||||
"github.com/minio/minio-go/pkg/s3signer"
|
"github.com/minio/minio-go/pkg/s3signer"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -86,17 +88,46 @@ func TestGetBucketLocationRequest(t *testing.T) {
|
||||||
// Set UserAgent for the request.
|
// Set UserAgent for the request.
|
||||||
c.setUserAgent(req)
|
c.setUserAgent(req)
|
||||||
|
|
||||||
// Set sha256 sum for signature calculation only with signature version '4'.
|
// Get credentials from the configured credentials provider.
|
||||||
if c.signature.isV4() {
|
value, err := c.credsProvider.Get()
|
||||||
req.Header.Set("X-Amz-Content-Sha256", hex.EncodeToString(sum256([]byte{})))
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sign the request.
|
var (
|
||||||
if c.signature.isV4() {
|
signerType = value.SignerType
|
||||||
req = s3signer.SignV4(*req, c.accessKeyID, c.secretAccessKey, "us-east-1")
|
accessKeyID = value.AccessKeyID
|
||||||
} else if c.signature.isV2() {
|
secretAccessKey = value.SecretAccessKey
|
||||||
req = s3signer.SignV2(*req, c.accessKeyID, c.secretAccessKey)
|
sessionToken = value.SessionToken
|
||||||
|
)
|
||||||
|
|
||||||
|
// Custom signer set then override the behavior.
|
||||||
|
if c.overrideSignerType != credentials.SignatureDefault {
|
||||||
|
signerType = c.overrideSignerType
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If signerType returned by credentials helper is anonymous,
|
||||||
|
// then do not sign regardless of signerType override.
|
||||||
|
if value.SignerType == credentials.SignatureAnonymous {
|
||||||
|
signerType = credentials.SignatureAnonymous
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set sha256 sum for signature calculation only
|
||||||
|
// with signature version '4'.
|
||||||
|
switch {
|
||||||
|
case signerType.IsV4():
|
||||||
|
var contentSha256 string
|
||||||
|
if c.secure {
|
||||||
|
contentSha256 = unsignedPayload
|
||||||
|
} else {
|
||||||
|
contentSha256 = hex.EncodeToString(sum256([]byte{}))
|
||||||
|
}
|
||||||
|
req.Header.Set("X-Amz-Content-Sha256", contentSha256)
|
||||||
|
req = s3signer.SignV4(*req, accessKeyID, secretAccessKey, sessionToken, "us-east-1")
|
||||||
|
case signerType.IsV2():
|
||||||
|
req = s3signer.SignV2(*req, accessKeyID, secretAccessKey)
|
||||||
|
}
|
||||||
|
|
||||||
return req, nil
|
return req, nil
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,6 @@ package minio
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"crypto/md5"
|
"crypto/md5"
|
||||||
crand "crypto/rand"
|
|
||||||
|
|
||||||
"io"
|
"io"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
|
@ -301,15 +300,7 @@ func TestCorePutObject(t *testing.T) {
|
||||||
t.Fatal("Error:", err, bucketName)
|
t.Fatal("Error:", err, bucketName)
|
||||||
}
|
}
|
||||||
|
|
||||||
buf := make([]byte, minPartSize)
|
buf := bytes.Repeat([]byte("a"), minPartSize)
|
||||||
|
|
||||||
size, err := io.ReadFull(crand.Reader, buf)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal("Error:", err)
|
|
||||||
}
|
|
||||||
if size != minPartSize {
|
|
||||||
t.Fatalf("Error: number of bytes does not match, want %v, got %v\n", minPartSize, size)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Save the data
|
// Save the data
|
||||||
objectName := randString(60, rand.NewSource(time.Now().UnixNano()), "")
|
objectName := randString(60, rand.NewSource(time.Now().UnixNano()), "")
|
||||||
|
|
89
vendor/src/github.com/minio/minio-go/pkg/credentials/chain.go
vendored
Normal file
89
vendor/src/github.com/minio/minio-go/pkg/credentials/chain.go
vendored
Normal file
|
@ -0,0 +1,89 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
|
// A Chain will search for a provider which returns credentials
|
||||||
|
// and cache that provider until Retrieve is called again.
|
||||||
|
//
|
||||||
|
// The Chain provides a way of chaining multiple providers together
|
||||||
|
// which will pick the first available using priority order of the
|
||||||
|
// Providers in the list.
|
||||||
|
//
|
||||||
|
// If none of the Providers retrieve valid credentials Value, ChainProvider's
|
||||||
|
// Retrieve() will return the error, collecting all errors from all providers.
|
||||||
|
//
|
||||||
|
// If a Provider is found which returns valid credentials Value ChainProvider
|
||||||
|
// will cache that Provider for all calls to IsExpired(), until Retrieve is
|
||||||
|
// called again.
|
||||||
|
//
|
||||||
|
// creds := credentials.NewChainCredentials(
|
||||||
|
// []credentials.Provider{
|
||||||
|
// &credentials.EnvAWSS3{},
|
||||||
|
// &credentials.EnvMinio{},
|
||||||
|
// })
|
||||||
|
//
|
||||||
|
// // Usage of ChainCredentials.
|
||||||
|
// mc, err := minio.NewWithCredentials(endpoint, creds, secure, "us-east-1")
|
||||||
|
// if err != nil {
|
||||||
|
// log.Fatalln(err)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
type Chain struct {
|
||||||
|
Providers []Provider
|
||||||
|
curr Provider
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewChainCredentials returns a pointer to a new Credentials object
|
||||||
|
// wrapping a chain of providers.
|
||||||
|
func NewChainCredentials(providers []Provider) *Credentials {
|
||||||
|
return New(&Chain{
|
||||||
|
Providers: append([]Provider{}, providers...),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retrieve returns the credentials value or error if no provider returned
|
||||||
|
// without error.
|
||||||
|
//
|
||||||
|
// If a provider is found it will be cached and any calls to IsExpired()
|
||||||
|
// will return the expired state of the cached provider.
|
||||||
|
func (c *Chain) Retrieve() (Value, error) {
|
||||||
|
var errs []error
|
||||||
|
for _, p := range c.Providers {
|
||||||
|
creds, err := p.Retrieve()
|
||||||
|
if err != nil {
|
||||||
|
errs = append(errs, err)
|
||||||
|
continue
|
||||||
|
} // Success.
|
||||||
|
c.curr = p
|
||||||
|
return creds, nil
|
||||||
|
}
|
||||||
|
c.curr = nil
|
||||||
|
return Value{}, fmt.Errorf("No valid providers found %v", errs)
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsExpired will returned the expired state of the currently cached provider
|
||||||
|
// if there is one. If there is no current provider, true will be returned.
|
||||||
|
func (c *Chain) IsExpired() bool {
|
||||||
|
if c.curr != nil {
|
||||||
|
return c.curr.IsExpired()
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
137
vendor/src/github.com/minio/minio-go/pkg/credentials/chain_test.go
vendored
Normal file
137
vendor/src/github.com/minio/minio-go/pkg/credentials/chain_test.go
vendored
Normal file
|
@ -0,0 +1,137 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
type testCredProvider struct {
|
||||||
|
creds Value
|
||||||
|
expired bool
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *testCredProvider) Retrieve() (Value, error) {
|
||||||
|
s.expired = false
|
||||||
|
return s.creds, s.err
|
||||||
|
}
|
||||||
|
func (s *testCredProvider) IsExpired() bool {
|
||||||
|
return s.expired
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestChainGet(t *testing.T) {
|
||||||
|
p := &Chain{
|
||||||
|
Providers: []Provider{
|
||||||
|
&credProvider{err: errors.New("FirstError")},
|
||||||
|
&credProvider{err: errors.New("SecondError")},
|
||||||
|
&testCredProvider{
|
||||||
|
creds: Value{
|
||||||
|
AccessKeyID: "AKIF",
|
||||||
|
SecretAccessKey: "NOSECRET",
|
||||||
|
SessionToken: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
&credProvider{
|
||||||
|
creds: Value{
|
||||||
|
AccessKeyID: "AKID",
|
||||||
|
SecretAccessKey: "SECRET",
|
||||||
|
SessionToken: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
creds, err := p.Retrieve()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Also check credentials
|
||||||
|
if creds.AccessKeyID != "AKIF" {
|
||||||
|
t.Fatalf("Expected 'AKIF', got %s", creds.AccessKeyID)
|
||||||
|
}
|
||||||
|
if creds.SecretAccessKey != "NOSECRET" {
|
||||||
|
t.Fatalf("Expected 'NOSECRET', got %s", creds.SecretAccessKey)
|
||||||
|
}
|
||||||
|
if creds.SessionToken != "" {
|
||||||
|
t.Fatalf("Expected empty token, got %s", creds.SessionToken)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestChainIsExpired(t *testing.T) {
|
||||||
|
credProvider := &credProvider{expired: true}
|
||||||
|
p := &Chain{
|
||||||
|
Providers: []Provider{
|
||||||
|
credProvider,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
if !p.IsExpired() {
|
||||||
|
t.Fatal("Expected expired to be true before any Retrieve")
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := p.Retrieve()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if p.IsExpired() {
|
||||||
|
t.Fatal("Expected to be not expired after Retrieve")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestChainWithNoProvider(t *testing.T) {
|
||||||
|
p := &Chain{
|
||||||
|
Providers: []Provider{},
|
||||||
|
}
|
||||||
|
if !p.IsExpired() {
|
||||||
|
t.Fatal("Expected to be expired with no providers")
|
||||||
|
}
|
||||||
|
_, err := p.Retrieve()
|
||||||
|
if err != nil {
|
||||||
|
if err.Error() != "No valid providers found []" {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestChainProviderWithNoValidProvider(t *testing.T) {
|
||||||
|
errs := []error{
|
||||||
|
errors.New("FirstError"),
|
||||||
|
errors.New("SecondError"),
|
||||||
|
}
|
||||||
|
p := &Chain{
|
||||||
|
Providers: []Provider{
|
||||||
|
&credProvider{err: errs[0]},
|
||||||
|
&credProvider{err: errs[1]},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
if !p.IsExpired() {
|
||||||
|
t.Fatal("Expected to be expired with no providers")
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := p.Retrieve()
|
||||||
|
if err != nil {
|
||||||
|
if err.Error() != "No valid providers found [FirstError SecondError]" {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
17
vendor/src/github.com/minio/minio-go/pkg/credentials/config.json.sample
vendored
Normal file
17
vendor/src/github.com/minio/minio-go/pkg/credentials/config.json.sample
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
{
|
||||||
|
"version": "8",
|
||||||
|
"hosts": {
|
||||||
|
"play": {
|
||||||
|
"url": "https://play.minio.io:9000",
|
||||||
|
"accessKey": "Q3AM3UQ867SPQQA43P2F",
|
||||||
|
"secretKey": "zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG",
|
||||||
|
"api": "S3v2"
|
||||||
|
},
|
||||||
|
"s3": {
|
||||||
|
"url": "https://s3.amazonaws.com",
|
||||||
|
"accessKey": "accessKey",
|
||||||
|
"secretKey": "secret",
|
||||||
|
"api": "S3v4"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
175
vendor/src/github.com/minio/minio-go/pkg/credentials/credentials.go
vendored
Normal file
175
vendor/src/github.com/minio/minio-go/pkg/credentials/credentials.go
vendored
Normal file
|
@ -0,0 +1,175 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A Value is the AWS credentials value for individual credential fields.
|
||||||
|
type Value struct {
|
||||||
|
// AWS Access key ID
|
||||||
|
AccessKeyID string
|
||||||
|
|
||||||
|
// AWS Secret Access Key
|
||||||
|
SecretAccessKey string
|
||||||
|
|
||||||
|
// AWS Session Token
|
||||||
|
SessionToken string
|
||||||
|
|
||||||
|
// Signature Type.
|
||||||
|
SignerType SignatureType
|
||||||
|
}
|
||||||
|
|
||||||
|
// A Provider is the interface for any component which will provide credentials
|
||||||
|
// Value. A provider is required to manage its own Expired state, and what to
|
||||||
|
// be expired means.
|
||||||
|
type Provider interface {
|
||||||
|
// Retrieve returns nil if it successfully retrieved the value.
|
||||||
|
// Error is returned if the value were not obtainable, or empty.
|
||||||
|
Retrieve() (Value, error)
|
||||||
|
|
||||||
|
// IsExpired returns if the credentials are no longer valid, and need
|
||||||
|
// to be retrieved.
|
||||||
|
IsExpired() bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// A Expiry provides shared expiration logic to be used by credentials
|
||||||
|
// providers to implement expiry functionality.
|
||||||
|
//
|
||||||
|
// The best method to use this struct is as an anonymous field within the
|
||||||
|
// provider's struct.
|
||||||
|
//
|
||||||
|
// Example:
|
||||||
|
// type IAMCredentialProvider struct {
|
||||||
|
// Expiry
|
||||||
|
// ...
|
||||||
|
// }
|
||||||
|
type Expiry struct {
|
||||||
|
// The date/time when to expire on
|
||||||
|
expiration time.Time
|
||||||
|
|
||||||
|
// If set will be used by IsExpired to determine the current time.
|
||||||
|
// Defaults to time.Now if CurrentTime is not set.
|
||||||
|
CurrentTime func() time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetExpiration sets the expiration IsExpired will check when called.
|
||||||
|
//
|
||||||
|
// If window is greater than 0 the expiration time will be reduced by the
|
||||||
|
// window value.
|
||||||
|
//
|
||||||
|
// Using a window is helpful to trigger credentials to expire sooner than
|
||||||
|
// the expiration time given to ensure no requests are made with expired
|
||||||
|
// tokens.
|
||||||
|
func (e *Expiry) SetExpiration(expiration time.Time, window time.Duration) {
|
||||||
|
e.expiration = expiration
|
||||||
|
if window > 0 {
|
||||||
|
e.expiration = e.expiration.Add(-window)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsExpired returns if the credentials are expired.
|
||||||
|
func (e *Expiry) IsExpired() bool {
|
||||||
|
if e.CurrentTime == nil {
|
||||||
|
e.CurrentTime = time.Now
|
||||||
|
}
|
||||||
|
return e.expiration.Before(e.CurrentTime())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Credentials - A container for synchronous safe retrieval of credentials Value.
|
||||||
|
// Credentials will cache the credentials value until they expire. Once the value
|
||||||
|
// expires the next Get will attempt to retrieve valid credentials.
|
||||||
|
//
|
||||||
|
// Credentials is safe to use across multiple goroutines and will manage the
|
||||||
|
// synchronous state so the Providers do not need to implement their own
|
||||||
|
// synchronization.
|
||||||
|
//
|
||||||
|
// The first Credentials.Get() will always call Provider.Retrieve() to get the
|
||||||
|
// first instance of the credentials Value. All calls to Get() after that
|
||||||
|
// will return the cached credentials Value until IsExpired() returns true.
|
||||||
|
type Credentials struct {
|
||||||
|
sync.Mutex
|
||||||
|
|
||||||
|
creds Value
|
||||||
|
forceRefresh bool
|
||||||
|
provider Provider
|
||||||
|
}
|
||||||
|
|
||||||
|
// New returns a pointer to a new Credentials with the provider set.
|
||||||
|
func New(provider Provider) *Credentials {
|
||||||
|
return &Credentials{
|
||||||
|
provider: provider,
|
||||||
|
forceRefresh: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get returns the credentials value, or error if the credentials Value failed
|
||||||
|
// to be retrieved.
|
||||||
|
//
|
||||||
|
// Will return the cached credentials Value if it has not expired. If the
|
||||||
|
// credentials Value has expired the Provider's Retrieve() will be called
|
||||||
|
// to refresh the credentials.
|
||||||
|
//
|
||||||
|
// If Credentials.Expire() was called the credentials Value will be force
|
||||||
|
// expired, and the next call to Get() will cause them to be refreshed.
|
||||||
|
func (c *Credentials) Get() (Value, error) {
|
||||||
|
c.Lock()
|
||||||
|
defer c.Unlock()
|
||||||
|
|
||||||
|
if c.isExpired() {
|
||||||
|
creds, err := c.provider.Retrieve()
|
||||||
|
if err != nil {
|
||||||
|
return Value{}, err
|
||||||
|
}
|
||||||
|
c.creds = creds
|
||||||
|
c.forceRefresh = false
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.creds, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Expire expires the credentials and forces them to be retrieved on the
|
||||||
|
// next call to Get().
|
||||||
|
//
|
||||||
|
// This will override the Provider's expired state, and force Credentials
|
||||||
|
// to call the Provider's Retrieve().
|
||||||
|
func (c *Credentials) Expire() {
|
||||||
|
c.Lock()
|
||||||
|
defer c.Unlock()
|
||||||
|
|
||||||
|
c.forceRefresh = true
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsExpired returns if the credentials are no longer valid, and need
|
||||||
|
// to be refreshed.
|
||||||
|
//
|
||||||
|
// If the Credentials were forced to be expired with Expire() this will
|
||||||
|
// reflect that override.
|
||||||
|
func (c *Credentials) IsExpired() bool {
|
||||||
|
c.Lock()
|
||||||
|
defer c.Unlock()
|
||||||
|
|
||||||
|
return c.isExpired()
|
||||||
|
}
|
||||||
|
|
||||||
|
// isExpired helper method wrapping the definition of expired credentials.
|
||||||
|
func (c *Credentials) isExpired() bool {
|
||||||
|
return c.forceRefresh || c.provider.IsExpired()
|
||||||
|
}
|
12
vendor/src/github.com/minio/minio-go/pkg/credentials/credentials.sample
vendored
Normal file
12
vendor/src/github.com/minio/minio-go/pkg/credentials/credentials.sample
vendored
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
[default]
|
||||||
|
aws_access_key_id = accessKey
|
||||||
|
aws_secret_access_key = secret
|
||||||
|
aws_session_token = token
|
||||||
|
|
||||||
|
[no_token]
|
||||||
|
aws_access_key_id = accessKey
|
||||||
|
aws_secret_access_key = secret
|
||||||
|
|
||||||
|
[with_colon]
|
||||||
|
aws_access_key_id: accessKey
|
||||||
|
aws_secret_access_key: secret
|
73
vendor/src/github.com/minio/minio-go/pkg/credentials/credentials_test.go
vendored
Normal file
73
vendor/src/github.com/minio/minio-go/pkg/credentials/credentials_test.go
vendored
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
type credProvider struct {
|
||||||
|
creds Value
|
||||||
|
expired bool
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *credProvider) Retrieve() (Value, error) {
|
||||||
|
s.expired = false
|
||||||
|
return s.creds, s.err
|
||||||
|
}
|
||||||
|
func (s *credProvider) IsExpired() bool {
|
||||||
|
return s.expired
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCredentialsGet(t *testing.T) {
|
||||||
|
c := New(&credProvider{
|
||||||
|
creds: Value{
|
||||||
|
AccessKeyID: "UXHW",
|
||||||
|
SecretAccessKey: "MYSECRET",
|
||||||
|
SessionToken: "",
|
||||||
|
},
|
||||||
|
expired: true,
|
||||||
|
})
|
||||||
|
|
||||||
|
creds, err := c.Get()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if "UXHW" != creds.AccessKeyID {
|
||||||
|
t.Errorf("Expected \"UXHW\", got %s", creds.AccessKeyID)
|
||||||
|
}
|
||||||
|
if "MYSECRET" != creds.SecretAccessKey {
|
||||||
|
t.Errorf("Expected \"MYSECRET\", got %s", creds.SecretAccessKey)
|
||||||
|
}
|
||||||
|
if creds.SessionToken != "" {
|
||||||
|
t.Errorf("Expected session token to be empty, got %s", creds.SessionToken)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCredentialsGetWithError(t *testing.T) {
|
||||||
|
c := New(&credProvider{err: errors.New("Custom error")})
|
||||||
|
|
||||||
|
_, err := c.Get()
|
||||||
|
if err != nil {
|
||||||
|
if err.Error() != "Custom error" {
|
||||||
|
t.Errorf("Expected \"Custom error\", got %s", err.Error())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
45
vendor/src/github.com/minio/minio-go/pkg/credentials/doc.go
vendored
Normal file
45
vendor/src/github.com/minio/minio-go/pkg/credentials/doc.go
vendored
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
// Package credentials provides credential retrieval and management
|
||||||
|
// for S3 compatible object storage.
|
||||||
|
//
|
||||||
|
// By default the Credentials.Get() will cache the successful result of a
|
||||||
|
// Provider's Retrieve() until Provider.IsExpired() returns true. At which
|
||||||
|
// point Credentials will call Provider's Retrieve() to get new credential Value.
|
||||||
|
//
|
||||||
|
// The Provider is responsible for determining when credentials have expired.
|
||||||
|
// It is also important to note that Credentials will always call Retrieve the
|
||||||
|
// first time Credentials.Get() is called.
|
||||||
|
//
|
||||||
|
// Example of using the environment variable credentials.
|
||||||
|
//
|
||||||
|
// creds := NewFromEnv()
|
||||||
|
// // Retrieve the credentials value
|
||||||
|
// credValue, err := creds.Get()
|
||||||
|
// if err != nil {
|
||||||
|
// // handle error
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// Example of forcing credentials to expire and be refreshed on the next Get().
|
||||||
|
// This may be helpful to proactively expire credentials and refresh them sooner
|
||||||
|
// than they would naturally expire on their own.
|
||||||
|
//
|
||||||
|
// creds := NewFromIAM("")
|
||||||
|
// creds.Expire()
|
||||||
|
// credsValue, err := creds.Get()
|
||||||
|
// // New credentials will be retrieved instead of from cache.
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// Custom Provider
|
||||||
|
//
|
||||||
|
// Each Provider built into this package also provides a helper method to generate
|
||||||
|
// a Credentials pointer setup with the provider. To use a custom Provider just
|
||||||
|
// create a type which satisfies the Provider interface and pass it to the
|
||||||
|
// NewCredentials method.
|
||||||
|
//
|
||||||
|
// type MyProvider struct{}
|
||||||
|
// func (m *MyProvider) Retrieve() (Value, error) {...}
|
||||||
|
// func (m *MyProvider) IsExpired() bool {...}
|
||||||
|
//
|
||||||
|
// creds := NewCredentials(&MyProvider{})
|
||||||
|
// credValue, err := creds.Get()
|
||||||
|
//
|
||||||
|
package credentials
|
71
vendor/src/github.com/minio/minio-go/pkg/credentials/env_aws.go
vendored
Normal file
71
vendor/src/github.com/minio/minio-go/pkg/credentials/env_aws.go
vendored
Normal file
|
@ -0,0 +1,71 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import "os"
|
||||||
|
|
||||||
|
// A EnvAWS retrieves credentials from the environment variables of the
|
||||||
|
// running process. EnvAWSironment credentials never expire.
|
||||||
|
//
|
||||||
|
// EnvAWSironment variables used:
|
||||||
|
//
|
||||||
|
// * Access Key ID: AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY.
|
||||||
|
// * Secret Access Key: AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY.
|
||||||
|
// * Secret Token: AWS_SESSION_TOKEN.
|
||||||
|
type EnvAWS struct {
|
||||||
|
retrieved bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewEnvAWS returns a pointer to a new Credentials object
|
||||||
|
// wrapping the environment variable provider.
|
||||||
|
func NewEnvAWS() *Credentials {
|
||||||
|
return New(&EnvAWS{})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retrieve retrieves the keys from the environment.
|
||||||
|
func (e *EnvAWS) Retrieve() (Value, error) {
|
||||||
|
e.retrieved = false
|
||||||
|
|
||||||
|
id := os.Getenv("AWS_ACCESS_KEY_ID")
|
||||||
|
if id == "" {
|
||||||
|
id = os.Getenv("AWS_ACCESS_KEY")
|
||||||
|
}
|
||||||
|
|
||||||
|
secret := os.Getenv("AWS_SECRET_ACCESS_KEY")
|
||||||
|
if secret == "" {
|
||||||
|
secret = os.Getenv("AWS_SECRET_KEY")
|
||||||
|
}
|
||||||
|
|
||||||
|
signerType := SignatureV4
|
||||||
|
if id == "" || secret == "" {
|
||||||
|
signerType = SignatureAnonymous
|
||||||
|
}
|
||||||
|
|
||||||
|
e.retrieved = true
|
||||||
|
return Value{
|
||||||
|
AccessKeyID: id,
|
||||||
|
SecretAccessKey: secret,
|
||||||
|
SessionToken: os.Getenv("AWS_SESSION_TOKEN"),
|
||||||
|
SignerType: signerType,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsExpired returns if the credentials have been retrieved.
|
||||||
|
func (e *EnvAWS) IsExpired() bool {
|
||||||
|
return !e.retrieved
|
||||||
|
}
|
62
vendor/src/github.com/minio/minio-go/pkg/credentials/env_minio.go
vendored
Normal file
62
vendor/src/github.com/minio/minio-go/pkg/credentials/env_minio.go
vendored
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import "os"
|
||||||
|
|
||||||
|
// A EnvMinio retrieves credentials from the environment variables of the
|
||||||
|
// running process. EnvMinioironment credentials never expire.
|
||||||
|
//
|
||||||
|
// EnvMinioironment variables used:
|
||||||
|
//
|
||||||
|
// * Access Key ID: MINIO_ACCESS_KEY.
|
||||||
|
// * Secret Access Key: MINIO_SECRET_KEY.
|
||||||
|
type EnvMinio struct {
|
||||||
|
retrieved bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewEnvMinio returns a pointer to a new Credentials object
|
||||||
|
// wrapping the environment variable provider.
|
||||||
|
func NewEnvMinio() *Credentials {
|
||||||
|
return New(&EnvMinio{})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retrieve retrieves the keys from the environment.
|
||||||
|
func (e *EnvMinio) Retrieve() (Value, error) {
|
||||||
|
e.retrieved = false
|
||||||
|
|
||||||
|
id := os.Getenv("MINIO_ACCESS_KEY")
|
||||||
|
secret := os.Getenv("MINIO_SECRET_KEY")
|
||||||
|
|
||||||
|
signerType := SignatureV4
|
||||||
|
if id == "" || secret == "" {
|
||||||
|
signerType = SignatureAnonymous
|
||||||
|
}
|
||||||
|
|
||||||
|
e.retrieved = true
|
||||||
|
return Value{
|
||||||
|
AccessKeyID: id,
|
||||||
|
SecretAccessKey: secret,
|
||||||
|
SignerType: signerType,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsExpired returns if the credentials have been retrieved.
|
||||||
|
func (e *EnvMinio) IsExpired() bool {
|
||||||
|
return !e.retrieved
|
||||||
|
}
|
105
vendor/src/github.com/minio/minio-go/pkg/credentials/env_test.go
vendored
Normal file
105
vendor/src/github.com/minio/minio-go/pkg/credentials/env_test.go
vendored
Normal file
|
@ -0,0 +1,105 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"reflect"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestEnvAWSRetrieve(t *testing.T) {
|
||||||
|
os.Clearenv()
|
||||||
|
os.Setenv("AWS_ACCESS_KEY_ID", "access")
|
||||||
|
os.Setenv("AWS_SECRET_ACCESS_KEY", "secret")
|
||||||
|
os.Setenv("AWS_SESSION_TOKEN", "token")
|
||||||
|
|
||||||
|
e := EnvAWS{}
|
||||||
|
if !e.IsExpired() {
|
||||||
|
t.Error("Expect creds to be expired before retrieve.")
|
||||||
|
}
|
||||||
|
|
||||||
|
creds, err := e.Retrieve()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
expectedCreds := Value{
|
||||||
|
AccessKeyID: "access",
|
||||||
|
SecretAccessKey: "secret",
|
||||||
|
SessionToken: "token",
|
||||||
|
SignerType: SignatureV4,
|
||||||
|
}
|
||||||
|
if !reflect.DeepEqual(creds, expectedCreds) {
|
||||||
|
t.Errorf("Expected %v, got %v", expectedCreds, creds)
|
||||||
|
}
|
||||||
|
|
||||||
|
if e.IsExpired() {
|
||||||
|
t.Error("Expect creds to not be expired after retrieve.")
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Clearenv()
|
||||||
|
os.Setenv("AWS_ACCESS_KEY", "access")
|
||||||
|
os.Setenv("AWS_SECRET_KEY", "secret")
|
||||||
|
|
||||||
|
expectedCreds = Value{
|
||||||
|
AccessKeyID: "access",
|
||||||
|
SecretAccessKey: "secret",
|
||||||
|
SignerType: SignatureV4,
|
||||||
|
}
|
||||||
|
|
||||||
|
creds, err = e.Retrieve()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !reflect.DeepEqual(creds, expectedCreds) {
|
||||||
|
t.Errorf("Expected %v, got %v", expectedCreds, creds)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestEnvMinioRetrieve(t *testing.T) {
|
||||||
|
os.Clearenv()
|
||||||
|
|
||||||
|
os.Setenv("MINIO_ACCESS_KEY", "access")
|
||||||
|
os.Setenv("MINIO_SECRET_KEY", "secret")
|
||||||
|
|
||||||
|
e := EnvMinio{}
|
||||||
|
if !e.IsExpired() {
|
||||||
|
t.Error("Expect creds to be expired before retrieve.")
|
||||||
|
}
|
||||||
|
|
||||||
|
creds, err := e.Retrieve()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
expectedCreds := Value{
|
||||||
|
AccessKeyID: "access",
|
||||||
|
SecretAccessKey: "secret",
|
||||||
|
SignerType: SignatureV4,
|
||||||
|
}
|
||||||
|
if !reflect.DeepEqual(creds, expectedCreds) {
|
||||||
|
t.Errorf("Expected %v, got %v", expectedCreds, creds)
|
||||||
|
}
|
||||||
|
|
||||||
|
if e.IsExpired() {
|
||||||
|
t.Error("Expect creds to not be expired after retrieve.")
|
||||||
|
}
|
||||||
|
}
|
120
vendor/src/github.com/minio/minio-go/pkg/credentials/file_aws_credentials.go
vendored
Normal file
120
vendor/src/github.com/minio/minio-go/pkg/credentials/file_aws_credentials.go
vendored
Normal file
|
@ -0,0 +1,120 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
|
||||||
|
"github.com/go-ini/ini"
|
||||||
|
homedir "github.com/minio/go-homedir"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A FileAWSCredentials retrieves credentials from the current user's home
|
||||||
|
// directory, and keeps track if those credentials are expired.
|
||||||
|
//
|
||||||
|
// Profile ini file example: $HOME/.aws/credentials
|
||||||
|
type FileAWSCredentials struct {
|
||||||
|
// Path to the shared credentials file.
|
||||||
|
//
|
||||||
|
// If empty will look for "AWS_SHARED_CREDENTIALS_FILE" env variable. If the
|
||||||
|
// env value is empty will default to current user's home directory.
|
||||||
|
// Linux/OSX: "$HOME/.aws/credentials"
|
||||||
|
// Windows: "%USERPROFILE%\.aws\credentials"
|
||||||
|
filename string
|
||||||
|
|
||||||
|
// AWS Profile to extract credentials from the shared credentials file. If empty
|
||||||
|
// will default to environment variable "AWS_PROFILE" or "default" if
|
||||||
|
// environment variable is also not set.
|
||||||
|
profile string
|
||||||
|
|
||||||
|
// retrieved states if the credentials have been successfully retrieved.
|
||||||
|
retrieved bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewFileAWSCredentials returns a pointer to a new Credentials object
|
||||||
|
// wrapping the Profile file provider.
|
||||||
|
func NewFileAWSCredentials(filename string, profile string) *Credentials {
|
||||||
|
return New(&FileAWSCredentials{
|
||||||
|
filename: filename,
|
||||||
|
profile: profile,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retrieve reads and extracts the shared credentials from the current
|
||||||
|
// users home directory.
|
||||||
|
func (p *FileAWSCredentials) Retrieve() (Value, error) {
|
||||||
|
if p.filename == "" {
|
||||||
|
p.filename = os.Getenv("AWS_SHARED_CREDENTIALS_FILE")
|
||||||
|
if p.filename == "" {
|
||||||
|
homeDir, err := homedir.Dir()
|
||||||
|
if err != nil {
|
||||||
|
return Value{}, err
|
||||||
|
}
|
||||||
|
p.filename = filepath.Join(homeDir, ".aws", "credentials")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if p.profile == "" {
|
||||||
|
p.profile = os.Getenv("AWS_PROFILE")
|
||||||
|
if p.profile == "" {
|
||||||
|
p.profile = "default"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
p.retrieved = false
|
||||||
|
|
||||||
|
iniProfile, err := loadProfile(p.filename, p.profile)
|
||||||
|
if err != nil {
|
||||||
|
return Value{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default to empty string if not found.
|
||||||
|
id := iniProfile.Key("aws_access_key_id")
|
||||||
|
// Default to empty string if not found.
|
||||||
|
secret := iniProfile.Key("aws_secret_access_key")
|
||||||
|
// Default to empty string if not found.
|
||||||
|
token := iniProfile.Key("aws_session_token")
|
||||||
|
|
||||||
|
p.retrieved = true
|
||||||
|
return Value{
|
||||||
|
AccessKeyID: id.String(),
|
||||||
|
SecretAccessKey: secret.String(),
|
||||||
|
SessionToken: token.String(),
|
||||||
|
SignerType: SignatureV4,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsExpired returns if the shared credentials have expired.
|
||||||
|
func (p *FileAWSCredentials) IsExpired() bool {
|
||||||
|
return !p.retrieved
|
||||||
|
}
|
||||||
|
|
||||||
|
// loadProfiles loads from the file pointed to by shared credentials filename for profile.
|
||||||
|
// The credentials retrieved from the profile will be returned or error. Error will be
|
||||||
|
// returned if it fails to read from the file, or the data is invalid.
|
||||||
|
func loadProfile(filename, profile string) (*ini.Section, error) {
|
||||||
|
config, err := ini.Load(filename)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
iniProfile, err := config.GetSection(profile)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return iniProfile, nil
|
||||||
|
}
|
129
vendor/src/github.com/minio/minio-go/pkg/credentials/file_minio_client.go
vendored
Normal file
129
vendor/src/github.com/minio/minio-go/pkg/credentials/file_minio_client.go
vendored
Normal file
|
@ -0,0 +1,129 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"io/ioutil"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
|
|
||||||
|
homedir "github.com/minio/go-homedir"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A FileMinioClient retrieves credentials from the current user's home
|
||||||
|
// directory, and keeps track if those credentials are expired.
|
||||||
|
//
|
||||||
|
// Configuration file example: $HOME/.mc/config.json
|
||||||
|
type FileMinioClient struct {
|
||||||
|
// Path to the shared credentials file.
|
||||||
|
//
|
||||||
|
// If empty will look for "MINIO_SHARED_CREDENTIALS_FILE" env variable. If the
|
||||||
|
// env value is empty will default to current user's home directory.
|
||||||
|
// Linux/OSX: "$HOME/.mc/config.json"
|
||||||
|
// Windows: "%USERALIAS%\mc\config.json"
|
||||||
|
filename string
|
||||||
|
|
||||||
|
// Minio Alias to extract credentials from the shared credentials file. If empty
|
||||||
|
// will default to environment variable "MINIO_ALIAS" or "default" if
|
||||||
|
// environment variable is also not set.
|
||||||
|
alias string
|
||||||
|
|
||||||
|
// retrieved states if the credentials have been successfully retrieved.
|
||||||
|
retrieved bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewFileMinioClient returns a pointer to a new Credentials object
|
||||||
|
// wrapping the Alias file provider.
|
||||||
|
func NewFileMinioClient(filename string, alias string) *Credentials {
|
||||||
|
return New(&FileMinioClient{
|
||||||
|
filename: filename,
|
||||||
|
alias: alias,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retrieve reads and extracts the shared credentials from the current
|
||||||
|
// users home directory.
|
||||||
|
func (p *FileMinioClient) Retrieve() (Value, error) {
|
||||||
|
if p.filename == "" {
|
||||||
|
homeDir, err := homedir.Dir()
|
||||||
|
if err != nil {
|
||||||
|
return Value{}, err
|
||||||
|
}
|
||||||
|
p.filename = filepath.Join(homeDir, ".mc", "config.json")
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
p.filename = filepath.Join(homeDir, "mc", "config.json")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if p.alias == "" {
|
||||||
|
p.alias = os.Getenv("MINIO_ALIAS")
|
||||||
|
if p.alias == "" {
|
||||||
|
p.alias = "s3"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
p.retrieved = false
|
||||||
|
|
||||||
|
hostCfg, err := loadAlias(p.filename, p.alias)
|
||||||
|
if err != nil {
|
||||||
|
return Value{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
p.retrieved = true
|
||||||
|
return Value{
|
||||||
|
AccessKeyID: hostCfg.AccessKey,
|
||||||
|
SecretAccessKey: hostCfg.SecretKey,
|
||||||
|
SignerType: parseSignatureType(hostCfg.API),
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsExpired returns if the shared credentials have expired.
|
||||||
|
func (p *FileMinioClient) IsExpired() bool {
|
||||||
|
return !p.retrieved
|
||||||
|
}
|
||||||
|
|
||||||
|
// hostConfig configuration of a host.
|
||||||
|
type hostConfig struct {
|
||||||
|
URL string `json:"url"`
|
||||||
|
AccessKey string `json:"accessKey"`
|
||||||
|
SecretKey string `json:"secretKey"`
|
||||||
|
API string `json:"api"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// config config version.
|
||||||
|
type config struct {
|
||||||
|
Version string `json:"version"`
|
||||||
|
Hosts map[string]hostConfig `json:"hosts"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// loadAliass loads from the file pointed to by shared credentials filename for alias.
|
||||||
|
// The credentials retrieved from the alias will be returned or error. Error will be
|
||||||
|
// returned if it fails to read from the file.
|
||||||
|
func loadAlias(filename, alias string) (hostConfig, error) {
|
||||||
|
cfg := &config{}
|
||||||
|
configBytes, err := ioutil.ReadFile(filename)
|
||||||
|
if err != nil {
|
||||||
|
return hostConfig{}, err
|
||||||
|
}
|
||||||
|
if err = json.Unmarshal(configBytes, cfg); err != nil {
|
||||||
|
return hostConfig{}, err
|
||||||
|
}
|
||||||
|
return cfg.Hosts[alias], nil
|
||||||
|
}
|
189
vendor/src/github.com/minio/minio-go/pkg/credentials/file_test.go
vendored
Normal file
189
vendor/src/github.com/minio/minio-go/pkg/credentials/file_test.go
vendored
Normal file
|
@ -0,0 +1,189 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestFileAWS(t *testing.T) {
|
||||||
|
os.Clearenv()
|
||||||
|
|
||||||
|
creds := NewFileAWSCredentials("credentials.sample", "")
|
||||||
|
credValues, err := creds.Get()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if credValues.AccessKeyID != "accessKey" {
|
||||||
|
t.Errorf("Expected 'accessKey', got %s'", credValues.AccessKeyID)
|
||||||
|
}
|
||||||
|
if credValues.SecretAccessKey != "secret" {
|
||||||
|
t.Errorf("Expected 'secret', got %s'", credValues.SecretAccessKey)
|
||||||
|
}
|
||||||
|
if credValues.SessionToken != "token" {
|
||||||
|
t.Errorf("Expected 'token', got %s'", credValues.SessionToken)
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Setenv("AWS_SHARED_CREDENTIALS_FILE", "credentials.sample")
|
||||||
|
creds = NewFileAWSCredentials("", "")
|
||||||
|
credValues, err = creds.Get()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if credValues.AccessKeyID != "accessKey" {
|
||||||
|
t.Errorf("Expected 'accessKey', got %s'", credValues.AccessKeyID)
|
||||||
|
}
|
||||||
|
if credValues.SecretAccessKey != "secret" {
|
||||||
|
t.Errorf("Expected 'secret', got %s'", credValues.SecretAccessKey)
|
||||||
|
}
|
||||||
|
if credValues.SessionToken != "token" {
|
||||||
|
t.Errorf("Expected 'token', got %s'", credValues.SessionToken)
|
||||||
|
}
|
||||||
|
|
||||||
|
wd, err := os.Getwd()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Setenv("AWS_SHARED_CREDENTIALS_FILE", filepath.Join(wd, "credentials.sample"))
|
||||||
|
creds = NewFileAWSCredentials("", "")
|
||||||
|
credValues, err = creds.Get()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if credValues.AccessKeyID != "accessKey" {
|
||||||
|
t.Errorf("Expected 'accessKey', got %s'", credValues.AccessKeyID)
|
||||||
|
}
|
||||||
|
if credValues.SecretAccessKey != "secret" {
|
||||||
|
t.Errorf("Expected 'secret', got %s'", credValues.SecretAccessKey)
|
||||||
|
}
|
||||||
|
if credValues.SessionToken != "token" {
|
||||||
|
t.Errorf("Expected 'token', got %s'", credValues.SessionToken)
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Clearenv()
|
||||||
|
os.Setenv("AWS_PROFILE", "no_token")
|
||||||
|
|
||||||
|
creds = NewFileAWSCredentials("credentials.sample", "")
|
||||||
|
credValues, err = creds.Get()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if credValues.AccessKeyID != "accessKey" {
|
||||||
|
t.Errorf("Expected 'accessKey', got %s'", credValues.AccessKeyID)
|
||||||
|
}
|
||||||
|
if credValues.SecretAccessKey != "secret" {
|
||||||
|
t.Errorf("Expected 'secret', got %s'", credValues.SecretAccessKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Clearenv()
|
||||||
|
|
||||||
|
creds = NewFileAWSCredentials("credentials.sample", "no_token")
|
||||||
|
credValues, err = creds.Get()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if credValues.AccessKeyID != "accessKey" {
|
||||||
|
t.Errorf("Expected 'accessKey', got %s'", credValues.AccessKeyID)
|
||||||
|
}
|
||||||
|
if credValues.SecretAccessKey != "secret" {
|
||||||
|
t.Errorf("Expected 'secret', got %s'", credValues.SecretAccessKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
creds = NewFileAWSCredentials("credentials-non-existent.sample", "no_token")
|
||||||
|
_, err = creds.Get()
|
||||||
|
if !os.IsNotExist(err) {
|
||||||
|
t.Errorf("Expected open non-existent.json: no such file or directory, got %s", err)
|
||||||
|
}
|
||||||
|
if !creds.IsExpired() {
|
||||||
|
t.Error("Should be expired if not loaded")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFileMinioClient(t *testing.T) {
|
||||||
|
os.Clearenv()
|
||||||
|
|
||||||
|
creds := NewFileMinioClient("config.json.sample", "")
|
||||||
|
credValues, err := creds.Get()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if credValues.AccessKeyID != "accessKey" {
|
||||||
|
t.Errorf("Expected 'accessKey', got %s'", credValues.AccessKeyID)
|
||||||
|
}
|
||||||
|
if credValues.SecretAccessKey != "secret" {
|
||||||
|
t.Errorf("Expected 'secret', got %s'", credValues.SecretAccessKey)
|
||||||
|
}
|
||||||
|
if credValues.SignerType != SignatureV4 {
|
||||||
|
t.Errorf("Expected 'S3v4', got %s'", credValues.SignerType)
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Clearenv()
|
||||||
|
os.Setenv("MINIO_ALIAS", "play")
|
||||||
|
|
||||||
|
creds = NewFileMinioClient("config.json.sample", "")
|
||||||
|
credValues, err = creds.Get()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if credValues.AccessKeyID != "Q3AM3UQ867SPQQA43P2F" {
|
||||||
|
t.Errorf("Expected 'Q3AM3UQ867SPQQA43P2F', got %s'", credValues.AccessKeyID)
|
||||||
|
}
|
||||||
|
if credValues.SecretAccessKey != "zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG" {
|
||||||
|
t.Errorf("Expected 'zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG', got %s'", credValues.SecretAccessKey)
|
||||||
|
}
|
||||||
|
if credValues.SignerType != SignatureV2 {
|
||||||
|
t.Errorf("Expected 'S3v2', got %s'", credValues.SignerType)
|
||||||
|
}
|
||||||
|
|
||||||
|
os.Clearenv()
|
||||||
|
|
||||||
|
creds = NewFileMinioClient("config.json.sample", "play")
|
||||||
|
credValues, err = creds.Get()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if credValues.AccessKeyID != "Q3AM3UQ867SPQQA43P2F" {
|
||||||
|
t.Errorf("Expected 'Q3AM3UQ867SPQQA43P2F', got %s'", credValues.AccessKeyID)
|
||||||
|
}
|
||||||
|
if credValues.SecretAccessKey != "zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG" {
|
||||||
|
t.Errorf("Expected 'zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG', got %s'", credValues.SecretAccessKey)
|
||||||
|
}
|
||||||
|
if credValues.SignerType != SignatureV2 {
|
||||||
|
t.Errorf("Expected 'S3v2', got %s'", credValues.SignerType)
|
||||||
|
}
|
||||||
|
|
||||||
|
creds = NewFileMinioClient("non-existent.json", "play")
|
||||||
|
_, err = creds.Get()
|
||||||
|
if !os.IsNotExist(err) {
|
||||||
|
t.Errorf("Expected open non-existent.json: no such file or directory, got %s", err)
|
||||||
|
}
|
||||||
|
if !creds.IsExpired() {
|
||||||
|
t.Error("Should be expired if not loaded")
|
||||||
|
}
|
||||||
|
}
|
196
vendor/src/github.com/minio/minio-go/pkg/credentials/iam_aws.go
vendored
Normal file
196
vendor/src/github.com/minio/minio-go/pkg/credentials/iam_aws.go
vendored
Normal file
|
@ -0,0 +1,196 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"path"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DefaultExpiryWindow - Default expiry window.
|
||||||
|
// ExpiryWindow will allow the credentials to trigger refreshing
|
||||||
|
// prior to the credentials actually expiring. This is beneficial
|
||||||
|
// so race conditions with expiring credentials do not cause
|
||||||
|
// request to fail unexpectedly due to ExpiredTokenException exceptions.
|
||||||
|
const DefaultExpiryWindow = time.Second * 10 // 10 secs
|
||||||
|
|
||||||
|
// A IAM retrieves credentials from the EC2 service, and keeps track if
|
||||||
|
// those credentials are expired.
|
||||||
|
type IAM struct {
|
||||||
|
Expiry
|
||||||
|
|
||||||
|
// Required http Client to use when connecting to IAM metadata service.
|
||||||
|
Client *http.Client
|
||||||
|
|
||||||
|
// Custom endpoint in place of
|
||||||
|
endpoint string
|
||||||
|
}
|
||||||
|
|
||||||
|
// redirectHeaders copies all headers when following a redirect URL.
|
||||||
|
// This won't be needed anymore from go 1.8 (https://github.com/golang/go/issues/4800)
|
||||||
|
func redirectHeaders(req *http.Request, via []*http.Request) error {
|
||||||
|
if len(via) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
for key, val := range via[0].Header {
|
||||||
|
req.Header[key] = val
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewIAM returns a pointer to a new Credentials object wrapping
|
||||||
|
// the IAM. Takes a ConfigProvider to create a EC2Metadata client.
|
||||||
|
// The ConfigProvider is satisfied by the session.Session type.
|
||||||
|
func NewIAM(endpoint string) *Credentials {
|
||||||
|
if endpoint == "" {
|
||||||
|
// IAM Roles for Amazon EC2
|
||||||
|
// http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html
|
||||||
|
endpoint = "http://169.254.169.254"
|
||||||
|
}
|
||||||
|
p := &IAM{
|
||||||
|
Client: &http.Client{
|
||||||
|
Transport: http.DefaultTransport,
|
||||||
|
CheckRedirect: redirectHeaders,
|
||||||
|
},
|
||||||
|
endpoint: endpoint,
|
||||||
|
}
|
||||||
|
return New(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retrieve retrieves credentials from the EC2 service.
|
||||||
|
// Error will be returned if the request fails, or unable to extract
|
||||||
|
// the desired
|
||||||
|
func (m *IAM) Retrieve() (Value, error) {
|
||||||
|
credsList, err := requestCredList(m.Client, m.endpoint)
|
||||||
|
if err != nil {
|
||||||
|
return Value{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(credsList) == 0 {
|
||||||
|
return Value{}, errors.New("empty EC2 Role list")
|
||||||
|
}
|
||||||
|
credsName := credsList[0]
|
||||||
|
|
||||||
|
roleCreds, err := requestCred(m.Client, m.endpoint, credsName)
|
||||||
|
if err != nil {
|
||||||
|
return Value{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Expiry window is set to 10secs.
|
||||||
|
m.SetExpiration(roleCreds.Expiration, DefaultExpiryWindow)
|
||||||
|
|
||||||
|
return Value{
|
||||||
|
AccessKeyID: roleCreds.AccessKeyID,
|
||||||
|
SecretAccessKey: roleCreds.SecretAccessKey,
|
||||||
|
SessionToken: roleCreds.Token,
|
||||||
|
SignerType: SignatureV4,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// A ec2RoleCredRespBody provides the shape for unmarshaling credential
|
||||||
|
// request responses.
|
||||||
|
type ec2RoleCredRespBody struct {
|
||||||
|
// Success State
|
||||||
|
Expiration time.Time
|
||||||
|
AccessKeyID string
|
||||||
|
SecretAccessKey string
|
||||||
|
Token string
|
||||||
|
|
||||||
|
// Error state
|
||||||
|
Code string
|
||||||
|
Message string
|
||||||
|
}
|
||||||
|
|
||||||
|
const iamSecurityCredsPath = "/latest/meta-data/iam/security-credentials"
|
||||||
|
|
||||||
|
// requestCredList requests a list of credentials from the EC2 service.
|
||||||
|
// If there are no credentials, or there is an error making or receiving the request
|
||||||
|
func requestCredList(client *http.Client, endpoint string) ([]string, error) {
|
||||||
|
u, err := url.Parse(endpoint)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
u.Path = iamSecurityCredsPath
|
||||||
|
req, err := http.NewRequest("GET", u.String(), nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return nil, errors.New(resp.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
credsList := []string{}
|
||||||
|
s := bufio.NewScanner(resp.Body)
|
||||||
|
for s.Scan() {
|
||||||
|
credsList = append(credsList, s.Text())
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := s.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return credsList, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// requestCred requests the credentials for a specific credentials from the EC2 service.
|
||||||
|
//
|
||||||
|
// If the credentials cannot be found, or there is an error reading the response
|
||||||
|
// and error will be returned.
|
||||||
|
func requestCred(client *http.Client, endpoint string, credsName string) (ec2RoleCredRespBody, error) {
|
||||||
|
u, err := url.Parse(endpoint)
|
||||||
|
if err != nil {
|
||||||
|
return ec2RoleCredRespBody{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
u.Path = path.Join(iamSecurityCredsPath, credsName)
|
||||||
|
req, err := http.NewRequest("GET", u.String(), nil)
|
||||||
|
if err != nil {
|
||||||
|
return ec2RoleCredRespBody{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return ec2RoleCredRespBody{}, err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return ec2RoleCredRespBody{}, errors.New(resp.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
respCreds := ec2RoleCredRespBody{}
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&respCreds); err != nil {
|
||||||
|
return ec2RoleCredRespBody{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if respCreds.Code != "Success" {
|
||||||
|
// If an error code was returned something failed requesting the role.
|
||||||
|
return ec2RoleCredRespBody{}, errors.New(respCreds.Message)
|
||||||
|
}
|
||||||
|
|
||||||
|
return respCreds, nil
|
||||||
|
}
|
180
vendor/src/github.com/minio/minio-go/pkg/credentials/iam_aws_test.go
vendored
Normal file
180
vendor/src/github.com/minio/minio-go/pkg/credentials/iam_aws_test.go
vendored
Normal file
|
@ -0,0 +1,180 @@
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const credsRespTmpl = `{
|
||||||
|
"Code": "Success",
|
||||||
|
"Type": "AWS-HMAC",
|
||||||
|
"AccessKeyId" : "accessKey",
|
||||||
|
"SecretAccessKey" : "secret",
|
||||||
|
"Token" : "token",
|
||||||
|
"Expiration" : "%s",
|
||||||
|
"LastUpdated" : "2009-11-23T0:00:00Z"
|
||||||
|
}`
|
||||||
|
|
||||||
|
const credsFailRespTmpl = `{
|
||||||
|
"Code": "ErrorCode",
|
||||||
|
"Message": "ErrorMsg",
|
||||||
|
"LastUpdated": "2009-11-23T0:00:00Z"
|
||||||
|
}`
|
||||||
|
|
||||||
|
func initTestFailServer() *httptest.Server {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
http.Error(w, "Not allowed", http.StatusBadRequest)
|
||||||
|
}))
|
||||||
|
return server
|
||||||
|
}
|
||||||
|
|
||||||
|
func initTestServerNoRoles() *httptest.Server {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Write([]byte(""))
|
||||||
|
}))
|
||||||
|
return server
|
||||||
|
}
|
||||||
|
|
||||||
|
func initTestServer(expireOn string, failAssume bool) *httptest.Server {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.URL.Path == "/latest/meta-data/iam/security-credentials" {
|
||||||
|
fmt.Fprintln(w, "RoleName")
|
||||||
|
} else if r.URL.Path == "/latest/meta-data/iam/security-credentials/RoleName" {
|
||||||
|
if failAssume {
|
||||||
|
fmt.Fprintf(w, credsFailRespTmpl)
|
||||||
|
} else {
|
||||||
|
fmt.Fprintf(w, credsRespTmpl, expireOn)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
http.Error(w, "bad request", http.StatusBadRequest)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
|
||||||
|
return server
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIAMMalformedEndpoint(t *testing.T) {
|
||||||
|
creds := NewIAM("%%%%")
|
||||||
|
_, err := creds.Get()
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("Unexpected should fail here")
|
||||||
|
}
|
||||||
|
if err.Error() != `parse %%%%: invalid URL escape "%%%"` {
|
||||||
|
t.Fatalf("Expected parse %%%%%%%%: invalid URL escape \"%%%%%%\", got %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIAMFailServer(t *testing.T) {
|
||||||
|
server := initTestFailServer()
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
creds := NewIAM(server.URL)
|
||||||
|
|
||||||
|
_, err := creds.Get()
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("Unexpected should fail here")
|
||||||
|
}
|
||||||
|
if err.Error() != "400 Bad Request" {
|
||||||
|
t.Fatalf("Expected '400 Bad Request', got %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIAMNoRoles(t *testing.T) {
|
||||||
|
server := initTestServerNoRoles()
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
creds := NewIAM(server.URL)
|
||||||
|
_, err := creds.Get()
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("Unexpected should fail here")
|
||||||
|
}
|
||||||
|
if err.Error() != "empty EC2 Role list" {
|
||||||
|
t.Fatalf("Expected 'empty EC2 Role list', got %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIAM(t *testing.T) {
|
||||||
|
server := initTestServer("2014-12-16T01:51:37Z", false)
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
p := &IAM{
|
||||||
|
Client: http.DefaultClient,
|
||||||
|
endpoint: server.URL,
|
||||||
|
}
|
||||||
|
|
||||||
|
creds, err := p.Retrieve()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if "accessKey" != creds.AccessKeyID {
|
||||||
|
t.Errorf("Expected \"accessKey\", got %s", creds.AccessKeyID)
|
||||||
|
}
|
||||||
|
|
||||||
|
if "secret" != creds.SecretAccessKey {
|
||||||
|
t.Errorf("Expected \"secret\", got %s", creds.SecretAccessKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
if "token" != creds.SessionToken {
|
||||||
|
t.Errorf("Expected \"token\", got %s", creds.SessionToken)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !p.IsExpired() {
|
||||||
|
t.Error("Expected creds to be expired.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIAMFailAssume(t *testing.T) {
|
||||||
|
server := initTestServer("2014-12-16T01:51:37Z", true)
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
p := &IAM{
|
||||||
|
Client: http.DefaultClient,
|
||||||
|
endpoint: server.URL,
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := p.Retrieve()
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("Unexpected success, should fail")
|
||||||
|
}
|
||||||
|
if err.Error() != "ErrorMsg" {
|
||||||
|
t.Errorf("Expected \"ErrorMsg\", got %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIAMIsExpired(t *testing.T) {
|
||||||
|
server := initTestServer("2014-12-16T01:51:37Z", false)
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
p := &IAM{
|
||||||
|
Client: http.DefaultClient,
|
||||||
|
endpoint: server.URL,
|
||||||
|
}
|
||||||
|
p.CurrentTime = func() time.Time {
|
||||||
|
return time.Date(2014, 12, 15, 21, 26, 0, 0, time.UTC)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !p.IsExpired() {
|
||||||
|
t.Error("Expected creds to be expired before retrieve.")
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := p.Retrieve()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if p.IsExpired() {
|
||||||
|
t.Error("Expected creds to not be expired after retrieve.")
|
||||||
|
}
|
||||||
|
|
||||||
|
p.CurrentTime = func() time.Time {
|
||||||
|
return time.Date(3014, 12, 15, 21, 26, 0, 0, time.UTC)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !p.IsExpired() {
|
||||||
|
t.Error("Expected creds to be expired when curren time has changed")
|
||||||
|
}
|
||||||
|
}
|
76
vendor/src/github.com/minio/minio-go/pkg/credentials/signature-type.go
vendored
Normal file
76
vendor/src/github.com/minio/minio-go/pkg/credentials/signature-type.go
vendored
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
// SignatureType is type of Authorization requested for a given HTTP request.
|
||||||
|
type SignatureType int
|
||||||
|
|
||||||
|
// Different types of supported signatures - default is SignatureV4 or SignatureDefault.
|
||||||
|
const (
|
||||||
|
// SignatureDefault is always set to v4.
|
||||||
|
SignatureDefault SignatureType = iota
|
||||||
|
SignatureV4
|
||||||
|
SignatureV2
|
||||||
|
SignatureV4Streaming
|
||||||
|
SignatureAnonymous // Anonymous signature signifies, no signature.
|
||||||
|
)
|
||||||
|
|
||||||
|
// IsV2 - is signature SignatureV2?
|
||||||
|
func (s SignatureType) IsV2() bool {
|
||||||
|
return s == SignatureV2
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsV4 - is signature SignatureV4?
|
||||||
|
func (s SignatureType) IsV4() bool {
|
||||||
|
return s == SignatureV4 || s == SignatureDefault
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsStreamingV4 - is signature SignatureV4Streaming?
|
||||||
|
func (s SignatureType) IsStreamingV4() bool {
|
||||||
|
return s == SignatureV4Streaming
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsAnonymous - is signature empty?
|
||||||
|
func (s SignatureType) IsAnonymous() bool {
|
||||||
|
return s == SignatureAnonymous
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stringer humanized version of signature type,
|
||||||
|
// strings returned here are case insensitive.
|
||||||
|
func (s SignatureType) String() string {
|
||||||
|
if s.IsV2() {
|
||||||
|
return "S3v2"
|
||||||
|
} else if s.IsV4() {
|
||||||
|
return "S3v4"
|
||||||
|
} else if s.IsStreamingV4() {
|
||||||
|
return "S3v4Streaming"
|
||||||
|
}
|
||||||
|
return "Anonymous"
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseSignatureType(str string) SignatureType {
|
||||||
|
if strings.EqualFold(str, "S3v4") {
|
||||||
|
return SignatureV4
|
||||||
|
} else if strings.EqualFold(str, "S3v2") {
|
||||||
|
return SignatureV2
|
||||||
|
} else if strings.EqualFold(str, "S3v4Streaming") {
|
||||||
|
return SignatureV4Streaming
|
||||||
|
}
|
||||||
|
return SignatureAnonymous
|
||||||
|
}
|
67
vendor/src/github.com/minio/minio-go/pkg/credentials/static.go
vendored
Normal file
67
vendor/src/github.com/minio/minio-go/pkg/credentials/static.go
vendored
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
// A Static is a set of credentials which are set programmatically,
|
||||||
|
// and will never expire.
|
||||||
|
type Static struct {
|
||||||
|
Value
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewStaticV2 returns a pointer to a new Credentials object
|
||||||
|
// wrapping a static credentials value provider, signature is
|
||||||
|
// set to v2. If access and secret are not specified then
|
||||||
|
// regardless of signature type set it Value will return
|
||||||
|
// as anonymous.
|
||||||
|
func NewStaticV2(id, secret, token string) *Credentials {
|
||||||
|
return NewStatic(id, secret, token, SignatureV2)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewStaticV4 is similar to NewStaticV2 with similar considerations.
|
||||||
|
func NewStaticV4(id, secret, token string) *Credentials {
|
||||||
|
return NewStatic(id, secret, token, SignatureV4)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewStatic returns a pointer to a new Credentials object
|
||||||
|
// wrapping a static credentials value provider.
|
||||||
|
func NewStatic(id, secret, token string, signerType SignatureType) *Credentials {
|
||||||
|
return New(&Static{
|
||||||
|
Value: Value{
|
||||||
|
AccessKeyID: id,
|
||||||
|
SecretAccessKey: secret,
|
||||||
|
SessionToken: token,
|
||||||
|
SignerType: signerType,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retrieve returns the static credentials.
|
||||||
|
func (s *Static) Retrieve() (Value, error) {
|
||||||
|
if s.AccessKeyID == "" || s.SecretAccessKey == "" {
|
||||||
|
// Anonymous is not an error
|
||||||
|
return Value{SignerType: SignatureAnonymous}, nil
|
||||||
|
}
|
||||||
|
return s.Value, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsExpired returns if the credentials are expired.
|
||||||
|
//
|
||||||
|
// For Static, the credentials never expired.
|
||||||
|
func (s *Static) IsExpired() bool {
|
||||||
|
return false
|
||||||
|
}
|
68
vendor/src/github.com/minio/minio-go/pkg/credentials/static_test.go
vendored
Normal file
68
vendor/src/github.com/minio/minio-go/pkg/credentials/static_test.go
vendored
Normal file
|
@ -0,0 +1,68 @@
|
||||||
|
/*
|
||||||
|
* Minio Go Library for Amazon S3 Compatible Cloud Storage
|
||||||
|
* (C) 2017 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package credentials
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestStaticGet(t *testing.T) {
|
||||||
|
creds := NewStatic("UXHW", "SECRET", "", SignatureV4)
|
||||||
|
credValues, err := creds.Get()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if "UXHW" != credValues.AccessKeyID {
|
||||||
|
t.Errorf("Expected access key ID to match \"UXHW\", got %s", credValues.AccessKeyID)
|
||||||
|
}
|
||||||
|
if "SECRET" != credValues.SecretAccessKey {
|
||||||
|
t.Errorf("Expected secret access key to match \"SECRET\", got %s", credValues.SecretAccessKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
if credValues.SessionToken != "" {
|
||||||
|
t.Error("Expected session token to match")
|
||||||
|
}
|
||||||
|
|
||||||
|
if credValues.SignerType != SignatureV4 {
|
||||||
|
t.Errorf("Expected 'S3v4', got %s", credValues.SignerType)
|
||||||
|
}
|
||||||
|
|
||||||
|
if creds.IsExpired() {
|
||||||
|
t.Error("Static credentials should never expire")
|
||||||
|
}
|
||||||
|
|
||||||
|
creds = NewStatic("", "", "", SignatureDefault)
|
||||||
|
credValues, err = creds.Get()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if "" != credValues.AccessKeyID {
|
||||||
|
t.Errorf("Expected access key ID to match empty string, got %s", credValues.AccessKeyID)
|
||||||
|
}
|
||||||
|
if "" != credValues.SecretAccessKey {
|
||||||
|
t.Errorf("Expected secret access key to match empty string, got %s", credValues.SecretAccessKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !credValues.SignerType.IsAnonymous() {
|
||||||
|
t.Errorf("Expected 'Anonymous', got %s", credValues.SignerType)
|
||||||
|
}
|
||||||
|
|
||||||
|
if creds.IsExpired() {
|
||||||
|
t.Error("Static credentials should never expire")
|
||||||
|
}
|
||||||
|
}
|
|
@ -92,9 +92,12 @@ func buildChunkStringToSign(t time.Time, region, previousSig string, chunkData [
|
||||||
|
|
||||||
// prepareStreamingRequest - prepares a request with appropriate
|
// prepareStreamingRequest - prepares a request with appropriate
|
||||||
// headers before computing the seed signature.
|
// headers before computing the seed signature.
|
||||||
func prepareStreamingRequest(req *http.Request, dataLen int64, timestamp time.Time) {
|
func prepareStreamingRequest(req *http.Request, sessionToken string, dataLen int64, timestamp time.Time) {
|
||||||
// Set x-amz-content-sha256 header.
|
// Set x-amz-content-sha256 header.
|
||||||
req.Header.Set("X-Amz-Content-Sha256", streamingSignAlgorithm)
|
req.Header.Set("X-Amz-Content-Sha256", streamingSignAlgorithm)
|
||||||
|
if sessionToken != "" {
|
||||||
|
req.Header.Set("X-Amz-Security-Token", sessionToken)
|
||||||
|
}
|
||||||
req.Header.Set("Content-Encoding", streamingEncoding)
|
req.Header.Set("Content-Encoding", streamingEncoding)
|
||||||
req.Header.Set("X-Amz-Date", timestamp.Format(iso8601DateFormat))
|
req.Header.Set("X-Amz-Date", timestamp.Format(iso8601DateFormat))
|
||||||
|
|
||||||
|
@ -138,6 +141,7 @@ func (s *StreamingReader) setSeedSignature(req *http.Request) {
|
||||||
type StreamingReader struct {
|
type StreamingReader struct {
|
||||||
accessKeyID string
|
accessKeyID string
|
||||||
secretAccessKey string
|
secretAccessKey string
|
||||||
|
sessionToken string
|
||||||
region string
|
region string
|
||||||
prevSignature string
|
prevSignature string
|
||||||
seedSignature string
|
seedSignature string
|
||||||
|
@ -195,16 +199,17 @@ func (s *StreamingReader) setStreamingAuthHeader(req *http.Request) {
|
||||||
|
|
||||||
// StreamingSignV4 - provides chunked upload signatureV4 support by
|
// StreamingSignV4 - provides chunked upload signatureV4 support by
|
||||||
// implementing io.Reader.
|
// implementing io.Reader.
|
||||||
func StreamingSignV4(req *http.Request, accessKeyID, secretAccessKey,
|
func StreamingSignV4(req *http.Request, accessKeyID, secretAccessKey, sessionToken,
|
||||||
region string, dataLen int64, reqTime time.Time) *http.Request {
|
region string, dataLen int64, reqTime time.Time) *http.Request {
|
||||||
|
|
||||||
// Set headers needed for streaming signature.
|
// Set headers needed for streaming signature.
|
||||||
prepareStreamingRequest(req, dataLen, reqTime)
|
prepareStreamingRequest(req, sessionToken, dataLen, reqTime)
|
||||||
|
|
||||||
stReader := &StreamingReader{
|
stReader := &StreamingReader{
|
||||||
baseReadCloser: req.Body,
|
baseReadCloser: req.Body,
|
||||||
accessKeyID: accessKeyID,
|
accessKeyID: accessKeyID,
|
||||||
secretAccessKey: secretAccessKey,
|
secretAccessKey: secretAccessKey,
|
||||||
|
sessionToken: sessionToken,
|
||||||
region: region,
|
region: region,
|
||||||
reqTime: reqTime,
|
reqTime: reqTime,
|
||||||
chunkBuf: make([]byte, payloadChunkSize),
|
chunkBuf: make([]byte, payloadChunkSize),
|
||||||
|
|
|
@ -39,7 +39,7 @@ func TestGetSeedSignature(t *testing.T) {
|
||||||
t.Fatalf("Failed to parse time - %v", err)
|
t.Fatalf("Failed to parse time - %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
req = StreamingSignV4(req, accessKeyID, secretAccessKeyID, "us-east-1", int64(dataLen), reqTime)
|
req = StreamingSignV4(req, accessKeyID, secretAccessKeyID, "", "us-east-1", int64(dataLen), reqTime)
|
||||||
actualSeedSignature := req.Body.(*StreamingReader).seedSignature
|
actualSeedSignature := req.Body.(*StreamingReader).seedSignature
|
||||||
|
|
||||||
expectedSeedSignature := "007480502de61457e955731b0f5d191f7e6f54a8a0f6cc7974a5ebd887965686"
|
expectedSeedSignature := "007480502de61457e955731b0f5d191f7e6f54a8a0f6cc7974a5ebd887965686"
|
||||||
|
@ -72,7 +72,7 @@ func TestSetStreamingAuthorization(t *testing.T) {
|
||||||
|
|
||||||
dataLen := int64(65 * 1024)
|
dataLen := int64(65 * 1024)
|
||||||
reqTime, _ := time.Parse(iso8601DateFormat, "20130524T000000Z")
|
reqTime, _ := time.Parse(iso8601DateFormat, "20130524T000000Z")
|
||||||
req = StreamingSignV4(req, accessKeyID, secretAccessKeyID, location, dataLen, reqTime)
|
req = StreamingSignV4(req, accessKeyID, secretAccessKeyID, "", location, dataLen, reqTime)
|
||||||
|
|
||||||
expectedAuthorization := "AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130524/us-east-1/s3/aws4_request,SignedHeaders=content-encoding;host;x-amz-content-sha256;x-amz-date;x-amz-decoded-content-length;x-amz-storage-class,Signature=007480502de61457e955731b0f5d191f7e6f54a8a0f6cc7974a5ebd887965686"
|
expectedAuthorization := "AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130524/us-east-1/s3/aws4_request,SignedHeaders=content-encoding;host;x-amz-content-sha256;x-amz-date;x-amz-decoded-content-length;x-amz-storage-class,Signature=007480502de61457e955731b0f5d191f7e6f54a8a0f6cc7974a5ebd887965686"
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ func TestStreamingReader(t *testing.T) {
|
||||||
|
|
||||||
baseReader := ioutil.NopCloser(bytes.NewReader(bytes.Repeat([]byte("a"), 65*1024)))
|
baseReader := ioutil.NopCloser(bytes.NewReader(bytes.Repeat([]byte("a"), 65*1024)))
|
||||||
req.Body = baseReader
|
req.Body = baseReader
|
||||||
req = StreamingSignV4(req, accessKeyID, secretAccessKeyID, location, dataLen, reqTime)
|
req = StreamingSignV4(req, accessKeyID, secretAccessKeyID, "", location, dataLen, reqTime)
|
||||||
|
|
||||||
b, err := ioutil.ReadAll(req.Body)
|
b, err := ioutil.ReadAll(req.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -206,7 +206,7 @@ func getStringToSignV4(t time.Time, location, canonicalRequest string) string {
|
||||||
|
|
||||||
// PreSignV4 presign the request, in accordance with
|
// PreSignV4 presign the request, in accordance with
|
||||||
// http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html.
|
// http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html.
|
||||||
func PreSignV4(req http.Request, accessKeyID, secretAccessKey, location string, expires int64) *http.Request {
|
func PreSignV4(req http.Request, accessKeyID, secretAccessKey, sessionToken, location string, expires int64) *http.Request {
|
||||||
// Presign is not needed for anonymous credentials.
|
// Presign is not needed for anonymous credentials.
|
||||||
if accessKeyID == "" || secretAccessKey == "" {
|
if accessKeyID == "" || secretAccessKey == "" {
|
||||||
return &req
|
return &req
|
||||||
|
@ -228,6 +228,10 @@ func PreSignV4(req http.Request, accessKeyID, secretAccessKey, location string,
|
||||||
query.Set("X-Amz-Expires", strconv.FormatInt(expires, 10))
|
query.Set("X-Amz-Expires", strconv.FormatInt(expires, 10))
|
||||||
query.Set("X-Amz-SignedHeaders", signedHeaders)
|
query.Set("X-Amz-SignedHeaders", signedHeaders)
|
||||||
query.Set("X-Amz-Credential", credential)
|
query.Set("X-Amz-Credential", credential)
|
||||||
|
// Set session token if available.
|
||||||
|
if sessionToken != "" {
|
||||||
|
query.Set("X-Amz-Security-Token", sessionToken)
|
||||||
|
}
|
||||||
req.URL.RawQuery = query.Encode()
|
req.URL.RawQuery = query.Encode()
|
||||||
|
|
||||||
// Get canonical request.
|
// Get canonical request.
|
||||||
|
@ -260,7 +264,7 @@ func PostPresignSignatureV4(policyBase64 string, t time.Time, secretAccessKey, l
|
||||||
|
|
||||||
// SignV4 sign the request before Do(), in accordance with
|
// SignV4 sign the request before Do(), in accordance with
|
||||||
// http://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html.
|
// http://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html.
|
||||||
func SignV4(req http.Request, accessKeyID, secretAccessKey, location string) *http.Request {
|
func SignV4(req http.Request, accessKeyID, secretAccessKey, sessionToken, location string) *http.Request {
|
||||||
// Signature calculation is not needed for anonymous credentials.
|
// Signature calculation is not needed for anonymous credentials.
|
||||||
if accessKeyID == "" || secretAccessKey == "" {
|
if accessKeyID == "" || secretAccessKey == "" {
|
||||||
return &req
|
return &req
|
||||||
|
@ -272,6 +276,11 @@ func SignV4(req http.Request, accessKeyID, secretAccessKey, location string) *ht
|
||||||
// Set x-amz-date.
|
// Set x-amz-date.
|
||||||
req.Header.Set("X-Amz-Date", t.Format(iso8601DateFormat))
|
req.Header.Set("X-Amz-Date", t.Format(iso8601DateFormat))
|
||||||
|
|
||||||
|
// Set session token if available.
|
||||||
|
if sessionToken != "" {
|
||||||
|
req.Header.Set("X-Amz-Security-Token", sessionToken)
|
||||||
|
}
|
||||||
|
|
||||||
// Get canonical request.
|
// Get canonical request.
|
||||||
canonicalRequest := getCanonicalRequest(req, v4IgnoredHeaders)
|
canonicalRequest := getCanonicalRequest(req, v4IgnoredHeaders)
|
||||||
|
|
||||||
|
|
|
@ -28,12 +28,12 @@ func TestSignatureCalculation(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal("Error:", err)
|
t.Fatal("Error:", err)
|
||||||
}
|
}
|
||||||
req = SignV4(*req, "", "", "us-east-1")
|
req = SignV4(*req, "", "", "", "us-east-1")
|
||||||
if req.Header.Get("Authorization") != "" {
|
if req.Header.Get("Authorization") != "" {
|
||||||
t.Fatal("Error: anonymous credentials should not have Authorization header.")
|
t.Fatal("Error: anonymous credentials should not have Authorization header.")
|
||||||
}
|
}
|
||||||
|
|
||||||
req = PreSignV4(*req, "", "", "us-east-1", 0)
|
req = PreSignV4(*req, "", "", "", "us-east-1", 0)
|
||||||
if strings.Contains(req.URL.RawQuery, "X-Amz-Signature") {
|
if strings.Contains(req.URL.RawQuery, "X-Amz-Signature") {
|
||||||
t.Fatal("Error: anonymous credentials should not have Signature query resource.")
|
t.Fatal("Error: anonymous credentials should not have Signature query resource.")
|
||||||
}
|
}
|
||||||
|
@ -48,12 +48,12 @@ func TestSignatureCalculation(t *testing.T) {
|
||||||
t.Fatal("Error: anonymous credentials should not have Signature query resource.")
|
t.Fatal("Error: anonymous credentials should not have Signature query resource.")
|
||||||
}
|
}
|
||||||
|
|
||||||
req = SignV4(*req, "ACCESS-KEY", "SECRET-KEY", "us-east-1")
|
req = SignV4(*req, "ACCESS-KEY", "SECRET-KEY", "", "us-east-1")
|
||||||
if req.Header.Get("Authorization") == "" {
|
if req.Header.Get("Authorization") == "" {
|
||||||
t.Fatal("Error: normal credentials should have Authorization header.")
|
t.Fatal("Error: normal credentials should have Authorization header.")
|
||||||
}
|
}
|
||||||
|
|
||||||
req = PreSignV4(*req, "ACCESS-KEY", "SECRET-KEY", "us-east-1", 0)
|
req = PreSignV4(*req, "ACCESS-KEY", "SECRET-KEY", "", "us-east-1", 0)
|
||||||
if !strings.Contains(req.URL.RawQuery, "X-Amz-Signature") {
|
if !strings.Contains(req.URL.RawQuery, "X-Amz-Signature") {
|
||||||
t.Fatal("Error: normal credentials should have Signature query resource.")
|
t.Fatal("Error: normal credentials should have Signature query resource.")
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
/*
|
|
||||||
* Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package minio
|
|
||||||
|
|
||||||
// SignatureType is type of Authorization requested for a given HTTP request.
|
|
||||||
type SignatureType int
|
|
||||||
|
|
||||||
// Different types of supported signatures - default is Latest i.e SignatureV4.
|
|
||||||
const (
|
|
||||||
Latest SignatureType = iota
|
|
||||||
SignatureV4
|
|
||||||
SignatureV2
|
|
||||||
SignatureV4Streaming
|
|
||||||
)
|
|
||||||
|
|
||||||
var emptySHA256 = sum256(nil)
|
|
||||||
|
|
||||||
// isV2 - is signature SignatureV2?
|
|
||||||
func (s SignatureType) isV2() bool {
|
|
||||||
return s == SignatureV2
|
|
||||||
}
|
|
||||||
|
|
||||||
// isV4 - is signature SignatureV4?
|
|
||||||
func (s SignatureType) isV4() bool {
|
|
||||||
return s == SignatureV4 || s == Latest
|
|
||||||
}
|
|
||||||
|
|
||||||
// isStreamingV4 - is signature SignatureV4Streaming?
|
|
||||||
func (s SignatureType) isStreamingV4() bool {
|
|
||||||
return s == SignatureV4Streaming
|
|
||||||
}
|
|
|
@ -110,6 +110,8 @@ func closeResponse(resp *http.Response) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var emptySHA256 = sum256(nil)
|
||||||
|
|
||||||
// Sentinel URL is the default url value which is invalid.
|
// Sentinel URL is the default url value which is invalid.
|
||||||
var sentinelURL = url.URL{}
|
var sentinelURL = url.URL{}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue