scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant variables

Browse Source
This commit is contained in:
vishalnayak
2016-03-11 21:27:43 -05:00
parent 2275c3b844
commit 65bef4014d
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
audit/hashstructure.go
View File

@@ -29,12 +29,10 @@ func Hash(salter *salt.Salt, raw interface{}) error {
return nil return nil
} }
if s.ClientToken != "" { if s.ClientToken != "" {
token := fn(s.ClientToken) s.ClientToken = fn(s.ClientToken)
s.ClientToken = token
} }
if s.Accessor != "" { if s.Accessor != "" {
accessor := fn(s.Accessor) s.Accessor = fn(s.Accessor)
s.Accessor = accessor
} }
case *logical.Request: case *logical.Request:
@@ -48,8 +46,7 @@ func Hash(salter *salt.Salt, raw interface{}) error {
} }
if s.ClientToken != "" { if s.ClientToken != "" {
token := fn(s.ClientToken) s.ClientToken = fn(s.ClientToken)
s.ClientToken = token
} }
data, err := HashStructure(s.Data, fn) data, err := HashStructure(s.Data, fn)

6
website/source/docs/audit/file.html.md
View File

@@ -15,8 +15,8 @@ backend: it appends logs to a file. It does not currently assist with any log ro
Each line in the audit log is a JSON object. The `type` field specifies what type of Each line in the audit log is a JSON object. The `type` field specifies what type of
object it is. Currently, only two types exist: `request` and `response`. The line contains object it is. Currently, only two types exist: `request` and `response`. The line contains
all of the information for any given request and response. All the sensitive information all of the information for any given request and response. By default, all the sensitive
is first hashed before logging in the audit logs, by default. information is first hashed before logging in the audit logs.
## Enabling ## Enabling
@@ -31,7 +31,7 @@ $ vault audit-enable file path=/var/log/vault_audit.log
Any number of `file` audit logs can be created by enabling it with different `id`s. Any number of `file` audit logs can be created by enabling it with different `id`s.
``` ```
$ vault audit-enable -id="file_backend" file path=/home/user/vault_audit.log $ vault audit-enable -id="vault_audit_1" file path=/home/user/vault_audit.log
``` ```
Note the difference between `audit-enable` command options and the `file` backend Note the difference between `audit-enable` command options and the `file` backend

3
website/source/docs/audit/index.html.md
View File

@@ -86,7 +86,7 @@ block.
<ul> <ul>
<li> <li>
<span class="param">type</span> <span class="param">type</span>
<span class="param-flags">lequired</span> <span class="param-flags">required</span>
The path to where the audit log will be written. If this The path to where the audit log will be written. If this
path exists, the audit backend will append to it. path exists, the audit backend will append to it.
</li> </li>
@@ -100,6 +100,7 @@ block.
<span class="param">options</span> <span class="param">options</span>
<span class="param-flags">optional</span> <span class="param-flags">optional</span>
Configuration options of the backend in JSON format. Configuration options of the backend in JSON format.
Refer to `syslog` and `file` audit backend options.
</li> </li>
</ul> </ul>
</dd> </dd>

4
website/source/docs/audit/syslog.html.md
View File

@@ -18,8 +18,8 @@ and should not be enabled if any standby Vault instances do not support it.
Each line in the audit log is a JSON object. The `type` field specifies what type of Each line in the audit log is a JSON object. The `type` field specifies what type of
object it is. Currently, only two types exist: `request` and `response`. The line contains object it is. Currently, only two types exist: `request` and `response`. The line contains
all of the information for any given request and response. All the sensitive information all of the information for any given request and response. By default, all the sensitive
is first hashed before logging in the audit logs, by default. information is first hashed before logging in the audit logs.
## Enabling ## Enabling