From dc731cae2345b8f1842e2595aeff9641db5f6ac3 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Wed, 10 May 2023 10:27:25 +0200
Subject: [PATCH] Revert "feat: reusable ipns verify (#292)"

This reverts commit 236e39e7b6fd0fd7def4234fc8d482f3fb181d09.
---
 gateway/handler_ipns_record.go |   6 +-
 ipns/entries.go                | 141 ---------------------------------
 2 files changed, 4 insertions(+), 143 deletions(-)
 delete mode 100644 ipns/entries.go

diff --git a/gateway/handler_ipns_record.go b/gateway/handler_ipns_record.go
index 73d9dabd5..9d4f93e06 100644
--- a/gateway/handler_ipns_record.go
+++ b/gateway/handler_ipns_record.go
@@ -10,8 +10,9 @@ import (
 	"time"
 
 	"github.com/cespare/xxhash/v2"
+	"github.com/gogo/protobuf/proto"
 	ipath "github.com/ipfs/boxo/coreiface/path"
-	"github.com/ipfs/boxo/ipns"
+	ipns_pb "github.com/ipfs/boxo/ipns/pb"
 	"github.com/ipfs/go-cid"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
@@ -49,7 +50,8 @@ func (i *handler) serveIpnsRecord(ctx context.Context, w http.ResponseWriter, r
 		return false
 	}
 
-	record, err := ipns.UnmarshalIpnsEntry(rawRecord)
+	var record ipns_pb.IpnsEntry
+	err = proto.Unmarshal(rawRecord, &record)
 	if err != nil {
 		webError(w, err, http.StatusInternalServerError)
 		return false
diff --git a/ipns/entries.go b/ipns/entries.go
deleted file mode 100644
index a1dfef7ed..000000000
--- a/ipns/entries.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package ipns
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/gogo/protobuf/proto"
-	ipns_pb "github.com/ipfs/boxo/ipns/pb"
-	"github.com/ipld/go-ipld-prime"
-	"github.com/ipld/go-ipld-prime/codec/dagcbor"
-	"github.com/ipld/go-ipld-prime/codec/dagjson"
-	ic "github.com/libp2p/go-libp2p/core/crypto"
-	"github.com/libp2p/go-libp2p/core/peer"
-	mbase "github.com/multiformats/go-multibase"
-)
-
-// IpnsInspectEntry contains the deserialized values from an IPNS Entry:
-// https://github.com/ipfs/specs/blob/main/ipns/IPNS.md#record-serialization-format
-type IpnsInspectEntry struct {
-	Value        string
-	ValidityType *ipns_pb.IpnsEntry_ValidityType
-	Validity     *time.Time
-	Sequence     uint64
-	TTL          *uint64
-	PublicKey    string
-	SignatureV1  string
-	SignatureV2  string
-	Data         interface{}
-}
-
-type IpnsInspectValidation struct {
-	Valid     bool
-	Reason    string
-	PublicKey peer.ID
-}
-
-func UnmarshalIpnsEntry(data []byte) (*ipns_pb.IpnsEntry, error) {
-	var entry ipns_pb.IpnsEntry
-	err := proto.Unmarshal(data, &entry)
-	if err != nil {
-		return nil, err
-	}
-
-	return &entry, nil
-}
-
-func InspectIpnsRecord(entry *ipns_pb.IpnsEntry) (*IpnsInspectEntry, error) {
-	encoder, err := mbase.EncoderByName("base64")
-	if err != nil {
-		return nil, err
-	}
-
-	result := IpnsInspectEntry{
-		Value:        string(entry.Value),
-		ValidityType: entry.ValidityType,
-		Sequence:     *entry.Sequence,
-		TTL:          entry.Ttl,
-		PublicKey:    encoder.Encode(entry.PubKey),
-		SignatureV1:  encoder.Encode(entry.SignatureV1),
-		SignatureV2:  encoder.Encode(entry.SignatureV2),
-		Data:         nil,
-	}
-
-	if len(entry.Data) != 0 {
-		// This is hacky. The variable node (datamodel.Node) doesn't directly marshal
-		// to JSON. Therefore, we need to first decode from DAG-CBOR, then encode in
-		// DAG-JSON and finally unmarshal it from JSON. Since DAG-JSON is a subset
-		// of JSON, that should work. Then, we can store the final value in the
-		// result.Entry.Data for further inspection.
-		node, err := ipld.Decode(entry.Data, dagcbor.Decode)
-		if err != nil {
-			return nil, err
-		}
-
-		var buf bytes.Buffer
-		err = dagjson.Encode(node, &buf)
-		if err != nil {
-			return nil, err
-		}
-
-		err = json.Unmarshal(buf.Bytes(), &result.Data)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	validity, err := GetEOL(entry)
-	if err == nil {
-		result.Validity = &validity
-	}
-
-	return &result, nil
-}
-
-func Verify(key string, entry *ipns_pb.IpnsEntry) (*IpnsInspectValidation, error) {
-	id, err := peer.Decode(key)
-	if err != nil {
-		return nil, err
-	}
-
-	validation := &IpnsInspectValidation{
-		PublicKey: id,
-	}
-
-	pub, err := id.ExtractPublicKey()
-	if err != nil {
-		// Make sure it works with all those RSA that cannot be embedded into the
-		// Peer ID.
-		if len(entry.PubKey) > 0 {
-			pub, err = ic.UnmarshalPublicKey(entry.PubKey)
-			if err != nil {
-				return nil, err
-			}
-
-			// Verify the public key matches the name we are verifying.
-			entryID, err := peer.IDFromPublicKey(pub)
-
-			if err != nil {
-				return nil, err
-			}
-
-			if id != entryID {
-				return nil, fmt.Errorf("record public key does not match the verified name")
-			}
-		}
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	err = Validate(pub, entry)
-	if err == nil {
-		validation.Valid = true
-	} else {
-		validation.Reason = err.Error()
-	}
-
-	return validation, nil
-}