veyron/services/wspr: Take out assocIdentity stuff because it's broken
and I'm about to reimplement it anyways.
Change-Id: I24c5b2b654727e90a9e33e2b3a4f815f85f9bb5a
diff --git a/services/wsprd/wspr/pipe.go b/services/wsprd/wspr/pipe.go
index 3349f85..fbae344 100644
--- a/services/wsprd/wspr/pipe.go
+++ b/services/wsprd/wspr/pipe.go
@@ -233,8 +233,6 @@
go p.controller.HandleServerResponse(msg.Id, msg.Data)
case websocketSignatureRequest:
go p.controller.HandleSignatureRequest(msg.Data, ww)
- case websocketAssocIdentity:
- p.handleAssocIdentity(msg.Data, ww)
default:
ww.Error(verror.Unknownf("unknown message type: %v", msg.Type))
}
@@ -242,46 +240,6 @@
p.cleanup()
}
-type assocIdentityData struct {
- Account string
- Identity string // base64(vom(security.PrivateID))
- Origin string
-}
-
-// handleAssocIdentityRequest associates the identity with the origin
-func (p *pipe) handleAssocIdentity(data string, w lib.ClientWriter) {
- // Decode the request
- var parsedData assocIdentityData
- decoder := json.NewDecoder(bytes.NewBufferString(data))
- if err := decoder.Decode(&parsedData); err != nil {
- w.Error(verror.Internalf("can't unmarshal JSONMessage: %v", err))
- return
- }
-
- p.logger.VI(2).Info("associating name %v and private id %v to origin %v",
- parsedData.Account,
- parsedData.Identity,
- parsedData.Origin)
-
- idManager := p.wspr.idManager
-
- id := decodeIdentity(p.logger, parsedData.Identity)
- p.controller.UpdateIdentity(id)
-
- if err := idManager.AddAccount(parsedData.Account, id); err != nil {
- w.Error(verror.Internalf("identity.AddAccount(%v, %v) failed: %v", parsedData.Account, id, err))
- }
-
- if err := idManager.AddOrigin(parsedData.Origin, parsedData.Account, []security.ServiceCaveat{}); err != nil {
- w.Error(verror.Internalf("identity.AddOrigin(%v, %v, %v) failed: %v", parsedData.Origin, parsedData.Account, []security.ServiceCaveat{}, err))
- }
-
- if err := w.Send(lib.ResponseFinal, nil); err != nil {
- w.Error(verror.Internalf("error marshalling results: %v", err))
- return
- }
-}
-
func decodeIdentity(logger vlog.Logger, msg string) security.PrivateID {
if len(msg) == 0 {
return nil
diff --git a/services/wsprd/wspr/pipe_test.go b/services/wsprd/wspr/pipe_test.go
index 843d9a2..8a271c6 100644
--- a/services/wsprd/wspr/pipe_test.go
+++ b/services/wsprd/wspr/pipe_test.go
@@ -1,7 +1,6 @@
package wspr
import (
- "encoding/json"
"testing"
"veyron/services/wsprd/lib"
"veyron2"
@@ -20,35 +19,6 @@
func (*testWriter) Send(lib.ResponseType, interface{}) error { return nil }
func (*testWriter) Error(error) {}
-func TestHandleAssocIdentity(t *testing.T) {
- wspr := NewWSPR(0, "mockVeyronProxyEP")
- p := pipe{wspr: wspr, logger: wspr.rt.Logger()}
- p.setup()
-
- privateId := security.FakePrivateID("/fake/private/id")
- identityData := assocIdentityData{
- Account: "test@example.org",
- Identity: encodeIdentity(wspr.logger, privateId),
- Origin: "my.webapp.com",
- }
- jsonIdentityDataBytes, err := json.Marshal(identityData)
- if err != nil {
- t.Errorf("json.Marshal(%v) failed: %v", identityData, err)
- }
- jsonIdentityData := string(jsonIdentityDataBytes)
- writer := testWriter{}
- p.handleAssocIdentity(jsonIdentityData, lib.ClientWriter(&writer))
- // Check that the pipe has the privateId
- if p.controller.RT().Identity() != privateId {
- t.Errorf("p.privateId was not set. got: %v, expected: %v", p.controller.RT().Identity(), identityData.Identity)
- }
- // Check that wspr idManager has the origin
- _, err = wspr.idManager.Identity(identityData.Origin)
- if err != nil {
- t.Errorf("wspr.idManager.Identity(%v) failed: %v", identityData.Origin, err)
- }
-}
-
func TestEncodeDecodeIdentity(t *testing.T) {
identity := security.FakePrivateID("/fake/private/id")
resultIdentity := decodeIdentity(r.Logger(), encodeIdentity(r.Logger(), identity))
