Merge "README: Make API compatibility of the "ref" repository clearer."
diff --git a/examples/hello/hello_test.go b/examples/hello/hello_test.go
index bd5a04b..57c54a9 100644
--- a/examples/hello/hello_test.go
+++ b/examples/hello/hello_test.go
@@ -99,7 +99,7 @@
mt := fmt.Sprintf("%s=%s", envvar.NamespacePrefix, mounttabled.ExpectVar("NAME"))
agentdbin.WithEnv(creds["proxyd"], mt).Start(proxydbin.Path(),
"--name", proxyname, "--v23.tcp.address", "127.0.0.1:0",
- "--access-list", "{\"In\":[\"root/*\"]}")
+ "--access-list", "{\"In\":[\"root\"]}")
server := agentdbin.WithEnv(creds["helloserver"], mt).Start(serverbin.Path(),
"--name", name, "--v23.proxy", proxyname, "--v23.tcp.address", "")
// Prove that we're listening on a proxy.
diff --git a/profiles/internal/rpc/stream/proxy/proxy.go b/profiles/internal/rpc/stream/proxy/proxy.go
index 9cf4d92..414b759 100644
--- a/profiles/internal/rpc/stream/proxy/proxy.go
+++ b/profiles/internal/rpc/stream/proxy/proxy.go
@@ -391,7 +391,7 @@
func (p *Proxy) authorize(vc *vc.VC, request Request) error {
var dmap map[string]security.Discharge
if len(request.Discharges) > 0 {
- dmap := make(map[string]security.Discharge)
+ dmap = make(map[string]security.Discharge)
for _, d := range request.Discharges {
dmap[d.ID()] = d
}
diff --git a/services/identity/internal/templates/caveats.go b/services/identity/internal/templates/caveats.go
index 6dfae11..36b1057 100644
--- a/services/identity/internal/templates/caveats.go
+++ b/services/identity/internal/templates/caveats.go
@@ -15,7 +15,7 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.7.0/moment.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
- <title>Blessings: Select Caveats</title>
+ <title>Add Blessing</title>
<script>
$(document).ready(function() {
var numCaveats = 1;
@@ -139,6 +139,11 @@
<main style="max-width: 80%; margin-left: 10px;">
<form method="POST" id="caveats-form" name="input" action="{{.MacaroonURL}}" role="form">
<h1>Add blessing</h1>
+ <span>
+ This is a beta product: use in production applications is discouraged. Furthermore, the
+ <a href="https://v.io/glossary.html#blessing-root">Blessing Root</a> is subject to change
+ without notice.
+ </span>
<input type="text" class="hidden" name="macaroon" value="{{.Macaroon}}">
<h3>Blessing Name</h3>
