From dde58fcab6b9e39fde08ad258c050ea1cd886425 Mon Sep 17 00:00:00 2001 From: akakou Date: Fri, 11 Oct 2024 16:32:45 +0900 Subject: [PATCH 1/8] feat: add crtid --- verifier/ent/migrate/schema.go | 10 +- verifier/ent/mutation.go | 212 ++++++++++++------------ verifier/ent/runtime.go | 2 +- verifier/ent/schema/server.go | 1 + verifier/ent/schema/violation.go | 1 - verifier/ent/taserver.go | 13 +- verifier/ent/taserver/taserver.go | 8 + verifier/ent/taserver/where.go | 45 +++++ verifier/ent/taserver_create.go | 13 ++ verifier/ent/taserver_update.go | 54 ++++++ verifier/ent/taviolation.go | 13 +- verifier/ent/taviolation/taviolation.go | 8 - verifier/ent/taviolation/where.go | 45 ----- verifier/ent/taviolation_create.go | 13 -- verifier/ent/taviolation_update.go | 54 ------ 15 files changed, 246 insertions(+), 246 deletions(-) diff --git a/verifier/ent/migrate/schema.go b/verifier/ent/migrate/schema.go index 664accab..a6009053 100644 --- a/verifier/ent/migrate/schema.go +++ b/verifier/ent/migrate/schema.go @@ -72,6 +72,7 @@ var ( {Name: "domain", Type: field.TypeString}, {Name: "public_key", Type: field.TypeBytes}, {Name: "quote", Type: field.TypeString}, + {Name: "monitor_log_id", Type: field.TypeInt}, {Name: "is_active", Type: field.TypeBool, Default: false}, {Name: "ta_server_code", Type: field.TypeInt, Nullable: true}, {Name: "ta_server_service", Type: field.TypeInt, Nullable: true}, @@ -84,13 +85,13 @@ var ( ForeignKeys: []*schema.ForeignKey{ { Symbol: "ta_servers_ta_codes_code", - Columns: []*schema.Column{TaServersColumns[5]}, + Columns: []*schema.Column{TaServersColumns[6]}, RefColumns: []*schema.Column{TaCodesColumns[0]}, OnDelete: schema.SetNull, }, { Symbol: "ta_servers_services_service", - Columns: []*schema.Column{TaServersColumns[6]}, + Columns: []*schema.Column{TaServersColumns[7]}, RefColumns: []*schema.Column{ServicesColumns[0]}, OnDelete: schema.SetNull, }, @@ -100,7 +101,6 @@ var ( TaViolationsColumns = []*schema.Column{ {Name: "id", Type: field.TypeInt, Increment: true}, {Name: "created_at", Type: field.TypeTime}, - {Name: "monitor_log_id", Type: field.TypeInt}, {Name: "ta_violation_server", Type: field.TypeInt, Nullable: true}, {Name: "ta_violation_service", Type: field.TypeInt, Nullable: true}, } @@ -112,13 +112,13 @@ var ( ForeignKeys: []*schema.ForeignKey{ { Symbol: "ta_violations_ta_servers_server", - Columns: []*schema.Column{TaViolationsColumns[3]}, + Columns: []*schema.Column{TaViolationsColumns[2]}, RefColumns: []*schema.Column{TaServersColumns[0]}, OnDelete: schema.SetNull, }, { Symbol: "ta_violations_services_service", - Columns: []*schema.Column{TaViolationsColumns[4]}, + Columns: []*schema.Column{TaViolationsColumns[3]}, RefColumns: []*schema.Column{ServicesColumns[0]}, OnDelete: schema.SetNull, }, diff --git a/verifier/ent/mutation.go b/verifier/ent/mutation.go index 7abdb3ce..20c62251 100644 --- a/verifier/ent/mutation.go +++ b/verifier/ent/mutation.go @@ -1795,6 +1795,8 @@ type TAServerMutation struct { domain *string public_key *[]byte quote *string + monitor_log_id *int + addmonitor_log_id *int is_active *bool clearedFields map[string]struct{} violation map[int]struct{} @@ -2018,6 +2020,62 @@ func (m *TAServerMutation) ResetQuote() { m.quote = nil } +// SetMonitorLogID sets the "monitor_log_id" field. +func (m *TAServerMutation) SetMonitorLogID(i int) { + m.monitor_log_id = &i + m.addmonitor_log_id = nil +} + +// MonitorLogID returns the value of the "monitor_log_id" field in the mutation. +func (m *TAServerMutation) MonitorLogID() (r int, exists bool) { + v := m.monitor_log_id + if v == nil { + return + } + return *v, true +} + +// OldMonitorLogID returns the old "monitor_log_id" field's value of the TAServer entity. +// If the TAServer object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *TAServerMutation) OldMonitorLogID(ctx context.Context) (v int, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldMonitorLogID is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldMonitorLogID requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldMonitorLogID: %w", err) + } + return oldValue.MonitorLogID, nil +} + +// AddMonitorLogID adds i to the "monitor_log_id" field. +func (m *TAServerMutation) AddMonitorLogID(i int) { + if m.addmonitor_log_id != nil { + *m.addmonitor_log_id += i + } else { + m.addmonitor_log_id = &i + } +} + +// AddedMonitorLogID returns the value that was added to the "monitor_log_id" field in this mutation. +func (m *TAServerMutation) AddedMonitorLogID() (r int, exists bool) { + v := m.addmonitor_log_id + if v == nil { + return + } + return *v, true +} + +// ResetMonitorLogID resets all changes to the "monitor_log_id" field. +func (m *TAServerMutation) ResetMonitorLogID() { + m.monitor_log_id = nil + m.addmonitor_log_id = nil +} + // SetIsActive sets the "is_active" field. func (m *TAServerMutation) SetIsActive(b bool) { m.is_active = &b @@ -2274,7 +2332,7 @@ func (m *TAServerMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *TAServerMutation) Fields() []string { - fields := make([]string, 0, 4) + fields := make([]string, 0, 5) if m.domain != nil { fields = append(fields, taserver.FieldDomain) } @@ -2284,6 +2342,9 @@ func (m *TAServerMutation) Fields() []string { if m.quote != nil { fields = append(fields, taserver.FieldQuote) } + if m.monitor_log_id != nil { + fields = append(fields, taserver.FieldMonitorLogID) + } if m.is_active != nil { fields = append(fields, taserver.FieldIsActive) } @@ -2301,6 +2362,8 @@ func (m *TAServerMutation) Field(name string) (ent.Value, bool) { return m.PublicKey() case taserver.FieldQuote: return m.Quote() + case taserver.FieldMonitorLogID: + return m.MonitorLogID() case taserver.FieldIsActive: return m.IsActive() } @@ -2318,6 +2381,8 @@ func (m *TAServerMutation) OldField(ctx context.Context, name string) (ent.Value return m.OldPublicKey(ctx) case taserver.FieldQuote: return m.OldQuote(ctx) + case taserver.FieldMonitorLogID: + return m.OldMonitorLogID(ctx) case taserver.FieldIsActive: return m.OldIsActive(ctx) } @@ -2350,6 +2415,13 @@ func (m *TAServerMutation) SetField(name string, value ent.Value) error { } m.SetQuote(v) return nil + case taserver.FieldMonitorLogID: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetMonitorLogID(v) + return nil case taserver.FieldIsActive: v, ok := value.(bool) if !ok { @@ -2364,13 +2436,21 @@ func (m *TAServerMutation) SetField(name string, value ent.Value) error { // AddedFields returns all numeric fields that were incremented/decremented during // this mutation. func (m *TAServerMutation) AddedFields() []string { - return nil + var fields []string + if m.addmonitor_log_id != nil { + fields = append(fields, taserver.FieldMonitorLogID) + } + return fields } // AddedField returns the numeric value that was incremented/decremented on a field // with the given name. The second boolean return value indicates that this field // was not set, or was not defined in the schema. func (m *TAServerMutation) AddedField(name string) (ent.Value, bool) { + switch name { + case taserver.FieldMonitorLogID: + return m.AddedMonitorLogID() + } return nil, false } @@ -2379,6 +2459,13 @@ func (m *TAServerMutation) AddedField(name string) (ent.Value, bool) { // type. func (m *TAServerMutation) AddField(name string, value ent.Value) error { switch name { + case taserver.FieldMonitorLogID: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddMonitorLogID(v) + return nil } return fmt.Errorf("unknown TAServer numeric field %s", name) } @@ -2415,6 +2502,9 @@ func (m *TAServerMutation) ResetField(name string) error { case taserver.FieldQuote: m.ResetQuote() return nil + case taserver.FieldMonitorLogID: + m.ResetMonitorLogID() + return nil case taserver.FieldIsActive: m.ResetIsActive() return nil @@ -2571,20 +2661,18 @@ func (m *TAServerMutation) ResetEdge(name string) error { // TAViolationMutation represents an operation that mutates the TAViolation nodes in the graph. type TAViolationMutation struct { config - op Op - typ string - id *int - created_at *time.Time - monitor_log_id *int - addmonitor_log_id *int - clearedFields map[string]struct{} - server *int - clearedserver bool - service *int - clearedservice bool - done bool - oldValue func(context.Context) (*TAViolation, error) - predicates []predicate.TAViolation + op Op + typ string + id *int + created_at *time.Time + clearedFields map[string]struct{} + server *int + clearedserver bool + service *int + clearedservice bool + done bool + oldValue func(context.Context) (*TAViolation, error) + predicates []predicate.TAViolation } var _ ent.Mutation = (*TAViolationMutation)(nil) @@ -2721,62 +2809,6 @@ func (m *TAViolationMutation) ResetCreatedAt() { m.created_at = nil } -// SetMonitorLogID sets the "monitor_log_id" field. -func (m *TAViolationMutation) SetMonitorLogID(i int) { - m.monitor_log_id = &i - m.addmonitor_log_id = nil -} - -// MonitorLogID returns the value of the "monitor_log_id" field in the mutation. -func (m *TAViolationMutation) MonitorLogID() (r int, exists bool) { - v := m.monitor_log_id - if v == nil { - return - } - return *v, true -} - -// OldMonitorLogID returns the old "monitor_log_id" field's value of the TAViolation entity. -// If the TAViolation object wasn't provided to the builder, the object is fetched from the database. -// An error is returned if the mutation operation is not UpdateOne, or the database query fails. -func (m *TAViolationMutation) OldMonitorLogID(ctx context.Context) (v int, err error) { - if !m.op.Is(OpUpdateOne) { - return v, errors.New("OldMonitorLogID is only allowed on UpdateOne operations") - } - if m.id == nil || m.oldValue == nil { - return v, errors.New("OldMonitorLogID requires an ID field in the mutation") - } - oldValue, err := m.oldValue(ctx) - if err != nil { - return v, fmt.Errorf("querying old value for OldMonitorLogID: %w", err) - } - return oldValue.MonitorLogID, nil -} - -// AddMonitorLogID adds i to the "monitor_log_id" field. -func (m *TAViolationMutation) AddMonitorLogID(i int) { - if m.addmonitor_log_id != nil { - *m.addmonitor_log_id += i - } else { - m.addmonitor_log_id = &i - } -} - -// AddedMonitorLogID returns the value that was added to the "monitor_log_id" field in this mutation. -func (m *TAViolationMutation) AddedMonitorLogID() (r int, exists bool) { - v := m.addmonitor_log_id - if v == nil { - return - } - return *v, true -} - -// ResetMonitorLogID resets all changes to the "monitor_log_id" field. -func (m *TAViolationMutation) ResetMonitorLogID() { - m.monitor_log_id = nil - m.addmonitor_log_id = nil -} - // SetServerID sets the "server" edge to the TAServer entity by id. func (m *TAViolationMutation) SetServerID(id int) { m.server = &id @@ -2889,13 +2921,10 @@ func (m *TAViolationMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *TAViolationMutation) Fields() []string { - fields := make([]string, 0, 2) + fields := make([]string, 0, 1) if m.created_at != nil { fields = append(fields, taviolation.FieldCreatedAt) } - if m.monitor_log_id != nil { - fields = append(fields, taviolation.FieldMonitorLogID) - } return fields } @@ -2906,8 +2935,6 @@ func (m *TAViolationMutation) Field(name string) (ent.Value, bool) { switch name { case taviolation.FieldCreatedAt: return m.CreatedAt() - case taviolation.FieldMonitorLogID: - return m.MonitorLogID() } return nil, false } @@ -2919,8 +2946,6 @@ func (m *TAViolationMutation) OldField(ctx context.Context, name string) (ent.Va switch name { case taviolation.FieldCreatedAt: return m.OldCreatedAt(ctx) - case taviolation.FieldMonitorLogID: - return m.OldMonitorLogID(ctx) } return nil, fmt.Errorf("unknown TAViolation field %s", name) } @@ -2937,13 +2962,6 @@ func (m *TAViolationMutation) SetField(name string, value ent.Value) error { } m.SetCreatedAt(v) return nil - case taviolation.FieldMonitorLogID: - v, ok := value.(int) - if !ok { - return fmt.Errorf("unexpected type %T for field %s", value, name) - } - m.SetMonitorLogID(v) - return nil } return fmt.Errorf("unknown TAViolation field %s", name) } @@ -2951,21 +2969,13 @@ func (m *TAViolationMutation) SetField(name string, value ent.Value) error { // AddedFields returns all numeric fields that were incremented/decremented during // this mutation. func (m *TAViolationMutation) AddedFields() []string { - var fields []string - if m.addmonitor_log_id != nil { - fields = append(fields, taviolation.FieldMonitorLogID) - } - return fields + return nil } // AddedField returns the numeric value that was incremented/decremented on a field // with the given name. The second boolean return value indicates that this field // was not set, or was not defined in the schema. func (m *TAViolationMutation) AddedField(name string) (ent.Value, bool) { - switch name { - case taviolation.FieldMonitorLogID: - return m.AddedMonitorLogID() - } return nil, false } @@ -2974,13 +2984,6 @@ func (m *TAViolationMutation) AddedField(name string) (ent.Value, bool) { // type. func (m *TAViolationMutation) AddField(name string, value ent.Value) error { switch name { - case taviolation.FieldMonitorLogID: - v, ok := value.(int) - if !ok { - return fmt.Errorf("unexpected type %T for field %s", value, name) - } - m.AddMonitorLogID(v) - return nil } return fmt.Errorf("unknown TAViolation numeric field %s", name) } @@ -3011,9 +3014,6 @@ func (m *TAViolationMutation) ResetField(name string) error { case taviolation.FieldCreatedAt: m.ResetCreatedAt() return nil - case taviolation.FieldMonitorLogID: - m.ResetMonitorLogID() - return nil } return fmt.Errorf("unknown TAViolation field %s", name) } diff --git a/verifier/ent/runtime.go b/verifier/ent/runtime.go index 2fa29c2f..cee92ad0 100644 --- a/verifier/ent/runtime.go +++ b/verifier/ent/runtime.go @@ -31,7 +31,7 @@ func init() { taserverFields := schema.TAServer{}.Fields() _ = taserverFields // taserverDescIsActive is the schema descriptor for is_active field. - taserverDescIsActive := taserverFields[3].Descriptor() + taserverDescIsActive := taserverFields[4].Descriptor() // taserver.DefaultIsActive holds the default value on creation for the is_active field. taserver.DefaultIsActive = taserverDescIsActive.Default.(bool) taviolationFields := schema.TAViolation{}.Fields() diff --git a/verifier/ent/schema/server.go b/verifier/ent/schema/server.go index 232fa2c4..ce124032 100644 --- a/verifier/ent/schema/server.go +++ b/verifier/ent/schema/server.go @@ -17,6 +17,7 @@ func (TAServer) Fields() []ent.Field { field.String("domain"), field.Bytes("public_key"), field.String("quote"), + field.Int("monitor_log_id"), field.Bool("is_active").Default(false), } } diff --git a/verifier/ent/schema/violation.go b/verifier/ent/schema/violation.go index 2962783c..ed9eec2a 100644 --- a/verifier/ent/schema/violation.go +++ b/verifier/ent/schema/violation.go @@ -19,7 +19,6 @@ func (TAViolation) Fields() []ent.Field { field.Time("created_at").Immutable().Default(func() time.Time { return time.Now() }), - field.Int("monitor_log_id"), } } diff --git a/verifier/ent/taserver.go b/verifier/ent/taserver.go index 6ab6dc87..08a4df29 100644 --- a/verifier/ent/taserver.go +++ b/verifier/ent/taserver.go @@ -24,6 +24,8 @@ type TAServer struct { PublicKey []byte `json:"public_key,omitempty"` // Quote holds the value of the "quote" field. Quote string `json:"quote,omitempty"` + // MonitorLogID holds the value of the "monitor_log_id" field. + MonitorLogID int `json:"monitor_log_id,omitempty"` // IsActive holds the value of the "is_active" field. IsActive bool `json:"is_active,omitempty"` // Edges holds the relations/edges for other nodes in the graph. @@ -102,7 +104,7 @@ func (*TAServer) scanValues(columns []string) ([]any, error) { values[i] = new([]byte) case taserver.FieldIsActive: values[i] = new(sql.NullBool) - case taserver.FieldID: + case taserver.FieldID, taserver.FieldMonitorLogID: values[i] = new(sql.NullInt64) case taserver.FieldDomain, taserver.FieldQuote: values[i] = new(sql.NullString) @@ -149,6 +151,12 @@ func (ts *TAServer) assignValues(columns []string, values []any) error { } else if value.Valid { ts.Quote = value.String } + case taserver.FieldMonitorLogID: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field monitor_log_id", values[i]) + } else if value.Valid { + ts.MonitorLogID = int(value.Int64) + } case taserver.FieldIsActive: if value, ok := values[i].(*sql.NullBool); !ok { return fmt.Errorf("unexpected type %T for field is_active", values[i]) @@ -234,6 +242,9 @@ func (ts *TAServer) String() string { builder.WriteString("quote=") builder.WriteString(ts.Quote) builder.WriteString(", ") + builder.WriteString("monitor_log_id=") + builder.WriteString(fmt.Sprintf("%v", ts.MonitorLogID)) + builder.WriteString(", ") builder.WriteString("is_active=") builder.WriteString(fmt.Sprintf("%v", ts.IsActive)) builder.WriteByte(')') diff --git a/verifier/ent/taserver/taserver.go b/verifier/ent/taserver/taserver.go index b750044c..98559c3f 100644 --- a/verifier/ent/taserver/taserver.go +++ b/verifier/ent/taserver/taserver.go @@ -18,6 +18,8 @@ const ( FieldPublicKey = "public_key" // FieldQuote holds the string denoting the quote field in the database. FieldQuote = "quote" + // FieldMonitorLogID holds the string denoting the monitor_log_id field in the database. + FieldMonitorLogID = "monitor_log_id" // FieldIsActive holds the string denoting the is_active field in the database. FieldIsActive = "is_active" // EdgeViolation holds the string denoting the violation edge name in mutations. @@ -66,6 +68,7 @@ var Columns = []string{ FieldDomain, FieldPublicKey, FieldQuote, + FieldMonitorLogID, FieldIsActive, } @@ -114,6 +117,11 @@ func ByQuote(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldQuote, opts...).ToFunc() } +// ByMonitorLogID orders the results by the monitor_log_id field. +func ByMonitorLogID(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldMonitorLogID, opts...).ToFunc() +} + // ByIsActive orders the results by the is_active field. func ByIsActive(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldIsActive, opts...).ToFunc() diff --git a/verifier/ent/taserver/where.go b/verifier/ent/taserver/where.go index 6b599cf7..5e3fe46d 100644 --- a/verifier/ent/taserver/where.go +++ b/verifier/ent/taserver/where.go @@ -68,6 +68,11 @@ func Quote(v string) predicate.TAServer { return predicate.TAServer(sql.FieldEQ(FieldQuote, v)) } +// MonitorLogID applies equality check predicate on the "monitor_log_id" field. It's identical to MonitorLogIDEQ. +func MonitorLogID(v int) predicate.TAServer { + return predicate.TAServer(sql.FieldEQ(FieldMonitorLogID, v)) +} + // IsActive applies equality check predicate on the "is_active" field. It's identical to IsActiveEQ. func IsActive(v bool) predicate.TAServer { return predicate.TAServer(sql.FieldEQ(FieldIsActive, v)) @@ -243,6 +248,46 @@ func QuoteContainsFold(v string) predicate.TAServer { return predicate.TAServer(sql.FieldContainsFold(FieldQuote, v)) } +// MonitorLogIDEQ applies the EQ predicate on the "monitor_log_id" field. +func MonitorLogIDEQ(v int) predicate.TAServer { + return predicate.TAServer(sql.FieldEQ(FieldMonitorLogID, v)) +} + +// MonitorLogIDNEQ applies the NEQ predicate on the "monitor_log_id" field. +func MonitorLogIDNEQ(v int) predicate.TAServer { + return predicate.TAServer(sql.FieldNEQ(FieldMonitorLogID, v)) +} + +// MonitorLogIDIn applies the In predicate on the "monitor_log_id" field. +func MonitorLogIDIn(vs ...int) predicate.TAServer { + return predicate.TAServer(sql.FieldIn(FieldMonitorLogID, vs...)) +} + +// MonitorLogIDNotIn applies the NotIn predicate on the "monitor_log_id" field. +func MonitorLogIDNotIn(vs ...int) predicate.TAServer { + return predicate.TAServer(sql.FieldNotIn(FieldMonitorLogID, vs...)) +} + +// MonitorLogIDGT applies the GT predicate on the "monitor_log_id" field. +func MonitorLogIDGT(v int) predicate.TAServer { + return predicate.TAServer(sql.FieldGT(FieldMonitorLogID, v)) +} + +// MonitorLogIDGTE applies the GTE predicate on the "monitor_log_id" field. +func MonitorLogIDGTE(v int) predicate.TAServer { + return predicate.TAServer(sql.FieldGTE(FieldMonitorLogID, v)) +} + +// MonitorLogIDLT applies the LT predicate on the "monitor_log_id" field. +func MonitorLogIDLT(v int) predicate.TAServer { + return predicate.TAServer(sql.FieldLT(FieldMonitorLogID, v)) +} + +// MonitorLogIDLTE applies the LTE predicate on the "monitor_log_id" field. +func MonitorLogIDLTE(v int) predicate.TAServer { + return predicate.TAServer(sql.FieldLTE(FieldMonitorLogID, v)) +} + // IsActiveEQ applies the EQ predicate on the "is_active" field. func IsActiveEQ(v bool) predicate.TAServer { return predicate.TAServer(sql.FieldEQ(FieldIsActive, v)) diff --git a/verifier/ent/taserver_create.go b/verifier/ent/taserver_create.go index f2cd7c50..89383dc4 100644 --- a/verifier/ent/taserver_create.go +++ b/verifier/ent/taserver_create.go @@ -41,6 +41,12 @@ func (tsc *TAServerCreate) SetQuote(s string) *TAServerCreate { return tsc } +// SetMonitorLogID sets the "monitor_log_id" field. +func (tsc *TAServerCreate) SetMonitorLogID(i int) *TAServerCreate { + tsc.mutation.SetMonitorLogID(i) + return tsc +} + // SetIsActive sets the "is_active" field. func (tsc *TAServerCreate) SetIsActive(b bool) *TAServerCreate { tsc.mutation.SetIsActive(b) @@ -175,6 +181,9 @@ func (tsc *TAServerCreate) check() error { if _, ok := tsc.mutation.Quote(); !ok { return &ValidationError{Name: "quote", err: errors.New(`ent: missing required field "TAServer.quote"`)} } + if _, ok := tsc.mutation.MonitorLogID(); !ok { + return &ValidationError{Name: "monitor_log_id", err: errors.New(`ent: missing required field "TAServer.monitor_log_id"`)} + } if _, ok := tsc.mutation.IsActive(); !ok { return &ValidationError{Name: "is_active", err: errors.New(`ent: missing required field "TAServer.is_active"`)} } @@ -216,6 +225,10 @@ func (tsc *TAServerCreate) createSpec() (*TAServer, *sqlgraph.CreateSpec) { _spec.SetField(taserver.FieldQuote, field.TypeString, value) _node.Quote = value } + if value, ok := tsc.mutation.MonitorLogID(); ok { + _spec.SetField(taserver.FieldMonitorLogID, field.TypeInt, value) + _node.MonitorLogID = value + } if value, ok := tsc.mutation.IsActive(); ok { _spec.SetField(taserver.FieldIsActive, field.TypeBool, value) _node.IsActive = value diff --git a/verifier/ent/taserver_update.go b/verifier/ent/taserver_update.go index 938c9f34..fd364216 100644 --- a/verifier/ent/taserver_update.go +++ b/verifier/ent/taserver_update.go @@ -65,6 +65,27 @@ func (tsu *TAServerUpdate) SetNillableQuote(s *string) *TAServerUpdate { return tsu } +// SetMonitorLogID sets the "monitor_log_id" field. +func (tsu *TAServerUpdate) SetMonitorLogID(i int) *TAServerUpdate { + tsu.mutation.ResetMonitorLogID() + tsu.mutation.SetMonitorLogID(i) + return tsu +} + +// SetNillableMonitorLogID sets the "monitor_log_id" field if the given value is not nil. +func (tsu *TAServerUpdate) SetNillableMonitorLogID(i *int) *TAServerUpdate { + if i != nil { + tsu.SetMonitorLogID(*i) + } + return tsu +} + +// AddMonitorLogID adds i to the "monitor_log_id" field. +func (tsu *TAServerUpdate) AddMonitorLogID(i int) *TAServerUpdate { + tsu.mutation.AddMonitorLogID(i) + return tsu +} + // SetIsActive sets the "is_active" field. func (tsu *TAServerUpdate) SetIsActive(b bool) *TAServerUpdate { tsu.mutation.SetIsActive(b) @@ -251,6 +272,12 @@ func (tsu *TAServerUpdate) sqlSave(ctx context.Context) (n int, err error) { if value, ok := tsu.mutation.Quote(); ok { _spec.SetField(taserver.FieldQuote, field.TypeString, value) } + if value, ok := tsu.mutation.MonitorLogID(); ok { + _spec.SetField(taserver.FieldMonitorLogID, field.TypeInt, value) + } + if value, ok := tsu.mutation.AddedMonitorLogID(); ok { + _spec.AddField(taserver.FieldMonitorLogID, field.TypeInt, value) + } if value, ok := tsu.mutation.IsActive(); ok { _spec.SetField(taserver.FieldIsActive, field.TypeBool, value) } @@ -456,6 +483,27 @@ func (tsuo *TAServerUpdateOne) SetNillableQuote(s *string) *TAServerUpdateOne { return tsuo } +// SetMonitorLogID sets the "monitor_log_id" field. +func (tsuo *TAServerUpdateOne) SetMonitorLogID(i int) *TAServerUpdateOne { + tsuo.mutation.ResetMonitorLogID() + tsuo.mutation.SetMonitorLogID(i) + return tsuo +} + +// SetNillableMonitorLogID sets the "monitor_log_id" field if the given value is not nil. +func (tsuo *TAServerUpdateOne) SetNillableMonitorLogID(i *int) *TAServerUpdateOne { + if i != nil { + tsuo.SetMonitorLogID(*i) + } + return tsuo +} + +// AddMonitorLogID adds i to the "monitor_log_id" field. +func (tsuo *TAServerUpdateOne) AddMonitorLogID(i int) *TAServerUpdateOne { + tsuo.mutation.AddMonitorLogID(i) + return tsuo +} + // SetIsActive sets the "is_active" field. func (tsuo *TAServerUpdateOne) SetIsActive(b bool) *TAServerUpdateOne { tsuo.mutation.SetIsActive(b) @@ -672,6 +720,12 @@ func (tsuo *TAServerUpdateOne) sqlSave(ctx context.Context) (_node *TAServer, er if value, ok := tsuo.mutation.Quote(); ok { _spec.SetField(taserver.FieldQuote, field.TypeString, value) } + if value, ok := tsuo.mutation.MonitorLogID(); ok { + _spec.SetField(taserver.FieldMonitorLogID, field.TypeInt, value) + } + if value, ok := tsuo.mutation.AddedMonitorLogID(); ok { + _spec.AddField(taserver.FieldMonitorLogID, field.TypeInt, value) + } if value, ok := tsuo.mutation.IsActive(); ok { _spec.SetField(taserver.FieldIsActive, field.TypeBool, value) } diff --git a/verifier/ent/taviolation.go b/verifier/ent/taviolation.go index b119012b..742ff315 100644 --- a/verifier/ent/taviolation.go +++ b/verifier/ent/taviolation.go @@ -21,8 +21,6 @@ type TAViolation struct { ID int `json:"id,omitempty"` // CreatedAt holds the value of the "created_at" field. CreatedAt time.Time `json:"created_at,omitempty"` - // MonitorLogID holds the value of the "monitor_log_id" field. - MonitorLogID int `json:"monitor_log_id,omitempty"` // Edges holds the relations/edges for other nodes in the graph. // The values are being populated by the TAViolationQuery when eager-loading is set. Edges TAViolationEdges `json:"edges"` @@ -73,7 +71,7 @@ func (*TAViolation) scanValues(columns []string) ([]any, error) { values := make([]any, len(columns)) for i := range columns { switch columns[i] { - case taviolation.FieldID, taviolation.FieldMonitorLogID: + case taviolation.FieldID: values[i] = new(sql.NullInt64) case taviolation.FieldCreatedAt: values[i] = new(sql.NullTime) @@ -108,12 +106,6 @@ func (tv *TAViolation) assignValues(columns []string, values []any) error { } else if value.Valid { tv.CreatedAt = value.Time } - case taviolation.FieldMonitorLogID: - if value, ok := values[i].(*sql.NullInt64); !ok { - return fmt.Errorf("unexpected type %T for field monitor_log_id", values[i]) - } else if value.Valid { - tv.MonitorLogID = int(value.Int64) - } case taviolation.ForeignKeys[0]: if value, ok := values[i].(*sql.NullInt64); !ok { return fmt.Errorf("unexpected type %T for edge-field ta_violation_server", value) @@ -176,9 +168,6 @@ func (tv *TAViolation) String() string { builder.WriteString(fmt.Sprintf("id=%v, ", tv.ID)) builder.WriteString("created_at=") builder.WriteString(tv.CreatedAt.Format(time.ANSIC)) - builder.WriteString(", ") - builder.WriteString("monitor_log_id=") - builder.WriteString(fmt.Sprintf("%v", tv.MonitorLogID)) builder.WriteByte(')') return builder.String() } diff --git a/verifier/ent/taviolation/taviolation.go b/verifier/ent/taviolation/taviolation.go index 637b38b3..6437aea9 100644 --- a/verifier/ent/taviolation/taviolation.go +++ b/verifier/ent/taviolation/taviolation.go @@ -16,8 +16,6 @@ const ( FieldID = "id" // FieldCreatedAt holds the string denoting the created_at field in the database. FieldCreatedAt = "created_at" - // FieldMonitorLogID holds the string denoting the monitor_log_id field in the database. - FieldMonitorLogID = "monitor_log_id" // EdgeServer holds the string denoting the server edge name in mutations. EdgeServer = "server" // EdgeService holds the string denoting the service edge name in mutations. @@ -44,7 +42,6 @@ const ( var Columns = []string{ FieldID, FieldCreatedAt, - FieldMonitorLogID, } // ForeignKeys holds the SQL foreign-keys that are owned by the "ta_violations" @@ -87,11 +84,6 @@ func ByCreatedAt(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldCreatedAt, opts...).ToFunc() } -// ByMonitorLogID orders the results by the monitor_log_id field. -func ByMonitorLogID(opts ...sql.OrderTermOption) OrderOption { - return sql.OrderByField(FieldMonitorLogID, opts...).ToFunc() -} - // ByServerField orders the results by server field. func ByServerField(field string, opts ...sql.OrderTermOption) OrderOption { return func(s *sql.Selector) { diff --git a/verifier/ent/taviolation/where.go b/verifier/ent/taviolation/where.go index 40e6582f..1386bee8 100644 --- a/verifier/ent/taviolation/where.go +++ b/verifier/ent/taviolation/where.go @@ -60,11 +60,6 @@ func CreatedAt(v time.Time) predicate.TAViolation { return predicate.TAViolation(sql.FieldEQ(FieldCreatedAt, v)) } -// MonitorLogID applies equality check predicate on the "monitor_log_id" field. It's identical to MonitorLogIDEQ. -func MonitorLogID(v int) predicate.TAViolation { - return predicate.TAViolation(sql.FieldEQ(FieldMonitorLogID, v)) -} - // CreatedAtEQ applies the EQ predicate on the "created_at" field. func CreatedAtEQ(v time.Time) predicate.TAViolation { return predicate.TAViolation(sql.FieldEQ(FieldCreatedAt, v)) @@ -105,46 +100,6 @@ func CreatedAtLTE(v time.Time) predicate.TAViolation { return predicate.TAViolation(sql.FieldLTE(FieldCreatedAt, v)) } -// MonitorLogIDEQ applies the EQ predicate on the "monitor_log_id" field. -func MonitorLogIDEQ(v int) predicate.TAViolation { - return predicate.TAViolation(sql.FieldEQ(FieldMonitorLogID, v)) -} - -// MonitorLogIDNEQ applies the NEQ predicate on the "monitor_log_id" field. -func MonitorLogIDNEQ(v int) predicate.TAViolation { - return predicate.TAViolation(sql.FieldNEQ(FieldMonitorLogID, v)) -} - -// MonitorLogIDIn applies the In predicate on the "monitor_log_id" field. -func MonitorLogIDIn(vs ...int) predicate.TAViolation { - return predicate.TAViolation(sql.FieldIn(FieldMonitorLogID, vs...)) -} - -// MonitorLogIDNotIn applies the NotIn predicate on the "monitor_log_id" field. -func MonitorLogIDNotIn(vs ...int) predicate.TAViolation { - return predicate.TAViolation(sql.FieldNotIn(FieldMonitorLogID, vs...)) -} - -// MonitorLogIDGT applies the GT predicate on the "monitor_log_id" field. -func MonitorLogIDGT(v int) predicate.TAViolation { - return predicate.TAViolation(sql.FieldGT(FieldMonitorLogID, v)) -} - -// MonitorLogIDGTE applies the GTE predicate on the "monitor_log_id" field. -func MonitorLogIDGTE(v int) predicate.TAViolation { - return predicate.TAViolation(sql.FieldGTE(FieldMonitorLogID, v)) -} - -// MonitorLogIDLT applies the LT predicate on the "monitor_log_id" field. -func MonitorLogIDLT(v int) predicate.TAViolation { - return predicate.TAViolation(sql.FieldLT(FieldMonitorLogID, v)) -} - -// MonitorLogIDLTE applies the LTE predicate on the "monitor_log_id" field. -func MonitorLogIDLTE(v int) predicate.TAViolation { - return predicate.TAViolation(sql.FieldLTE(FieldMonitorLogID, v)) -} - // HasServer applies the HasEdge predicate on the "server" edge. func HasServer() predicate.TAViolation { return predicate.TAViolation(func(s *sql.Selector) { diff --git a/verifier/ent/taviolation_create.go b/verifier/ent/taviolation_create.go index 97e3438e..4d64910e 100644 --- a/verifier/ent/taviolation_create.go +++ b/verifier/ent/taviolation_create.go @@ -36,12 +36,6 @@ func (tvc *TAViolationCreate) SetNillableCreatedAt(t *time.Time) *TAViolationCre return tvc } -// SetMonitorLogID sets the "monitor_log_id" field. -func (tvc *TAViolationCreate) SetMonitorLogID(i int) *TAViolationCreate { - tvc.mutation.SetMonitorLogID(i) - return tvc -} - // SetServerID sets the "server" edge to the TAServer entity by ID. func (tvc *TAViolationCreate) SetServerID(id int) *TAViolationCreate { tvc.mutation.SetServerID(id) @@ -126,9 +120,6 @@ func (tvc *TAViolationCreate) check() error { if _, ok := tvc.mutation.CreatedAt(); !ok { return &ValidationError{Name: "created_at", err: errors.New(`ent: missing required field "TAViolation.created_at"`)} } - if _, ok := tvc.mutation.MonitorLogID(); !ok { - return &ValidationError{Name: "monitor_log_id", err: errors.New(`ent: missing required field "TAViolation.monitor_log_id"`)} - } return nil } @@ -159,10 +150,6 @@ func (tvc *TAViolationCreate) createSpec() (*TAViolation, *sqlgraph.CreateSpec) _spec.SetField(taviolation.FieldCreatedAt, field.TypeTime, value) _node.CreatedAt = value } - if value, ok := tvc.mutation.MonitorLogID(); ok { - _spec.SetField(taviolation.FieldMonitorLogID, field.TypeInt, value) - _node.MonitorLogID = value - } if nodes := tvc.mutation.ServerIDs(); len(nodes) > 0 { edge := &sqlgraph.EdgeSpec{ Rel: sqlgraph.M2O, diff --git a/verifier/ent/taviolation_update.go b/verifier/ent/taviolation_update.go index 4dcce305..8bcac8e0 100644 --- a/verifier/ent/taviolation_update.go +++ b/verifier/ent/taviolation_update.go @@ -29,27 +29,6 @@ func (tvu *TAViolationUpdate) Where(ps ...predicate.TAViolation) *TAViolationUpd return tvu } -// SetMonitorLogID sets the "monitor_log_id" field. -func (tvu *TAViolationUpdate) SetMonitorLogID(i int) *TAViolationUpdate { - tvu.mutation.ResetMonitorLogID() - tvu.mutation.SetMonitorLogID(i) - return tvu -} - -// SetNillableMonitorLogID sets the "monitor_log_id" field if the given value is not nil. -func (tvu *TAViolationUpdate) SetNillableMonitorLogID(i *int) *TAViolationUpdate { - if i != nil { - tvu.SetMonitorLogID(*i) - } - return tvu -} - -// AddMonitorLogID adds i to the "monitor_log_id" field. -func (tvu *TAViolationUpdate) AddMonitorLogID(i int) *TAViolationUpdate { - tvu.mutation.AddMonitorLogID(i) - return tvu -} - // SetServerID sets the "server" edge to the TAServer entity by ID. func (tvu *TAViolationUpdate) SetServerID(id int) *TAViolationUpdate { tvu.mutation.SetServerID(id) @@ -141,12 +120,6 @@ func (tvu *TAViolationUpdate) sqlSave(ctx context.Context) (n int, err error) { } } } - if value, ok := tvu.mutation.MonitorLogID(); ok { - _spec.SetField(taviolation.FieldMonitorLogID, field.TypeInt, value) - } - if value, ok := tvu.mutation.AddedMonitorLogID(); ok { - _spec.AddField(taviolation.FieldMonitorLogID, field.TypeInt, value) - } if tvu.mutation.ServerCleared() { edge := &sqlgraph.EdgeSpec{ Rel: sqlgraph.M2O, @@ -225,27 +198,6 @@ type TAViolationUpdateOne struct { mutation *TAViolationMutation } -// SetMonitorLogID sets the "monitor_log_id" field. -func (tvuo *TAViolationUpdateOne) SetMonitorLogID(i int) *TAViolationUpdateOne { - tvuo.mutation.ResetMonitorLogID() - tvuo.mutation.SetMonitorLogID(i) - return tvuo -} - -// SetNillableMonitorLogID sets the "monitor_log_id" field if the given value is not nil. -func (tvuo *TAViolationUpdateOne) SetNillableMonitorLogID(i *int) *TAViolationUpdateOne { - if i != nil { - tvuo.SetMonitorLogID(*i) - } - return tvuo -} - -// AddMonitorLogID adds i to the "monitor_log_id" field. -func (tvuo *TAViolationUpdateOne) AddMonitorLogID(i int) *TAViolationUpdateOne { - tvuo.mutation.AddMonitorLogID(i) - return tvuo -} - // SetServerID sets the "server" edge to the TAServer entity by ID. func (tvuo *TAViolationUpdateOne) SetServerID(id int) *TAViolationUpdateOne { tvuo.mutation.SetServerID(id) @@ -367,12 +319,6 @@ func (tvuo *TAViolationUpdateOne) sqlSave(ctx context.Context) (_node *TAViolati } } } - if value, ok := tvuo.mutation.MonitorLogID(); ok { - _spec.SetField(taviolation.FieldMonitorLogID, field.TypeInt, value) - } - if value, ok := tvuo.mutation.AddedMonitorLogID(); ok { - _spec.AddField(taviolation.FieldMonitorLogID, field.TypeInt, value) - } if tvuo.mutation.ServerCleared() { edge := &sqlgraph.EdgeSpec{ Rel: sqlgraph.M2O, From de9f87236111508df0b31e85d9ecd504122d48a7 Mon Sep 17 00:00:00 2001 From: akakou Date: Fri, 11 Oct 2024 16:33:13 +0900 Subject: [PATCH 2/8] feat: set monitor log id --- verifier/monitor/main.go | 4 +++- verifier/monitor/revoke.go | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/verifier/monitor/main.go b/verifier/monitor/main.go index 793b92e8..8d8d80fd 100644 --- a/verifier/monitor/main.go +++ b/verifier/monitor/main.go @@ -163,10 +163,12 @@ func (a *CrtshMonitor) Run(verifier *core.Verifier) { return } + serv.Update().SetMonitorLogID(option.ID).Save(*verifier.DB.Ctx) + err = Check(cert.PublicKey, serv) if err != nil { fmt.Printf("Violation: %v\n", err) - revoke(option.ID, serv, verifier) + revoke(serv, verifier) return } diff --git a/verifier/monitor/revoke.go b/verifier/monitor/revoke.go index 8a37c43f..c050934f 100644 --- a/verifier/monitor/revoke.go +++ b/verifier/monitor/revoke.go @@ -5,7 +5,7 @@ import ( "github.com/akakou/ra_webs/verifier/ent" ) -func revoke(id int, serv *ent.TAServer, verifier *core.Verifier) { +func revoke(serv *ent.TAServer, verifier *core.Verifier) { err := core.NotifierViolation(serv.Domain, verifier) if err != nil { panic(err) @@ -13,7 +13,6 @@ func revoke(id int, serv *ent.TAServer, verifier *core.Verifier) { verifier.DB.Client.TAViolation.Create(). SetServer(serv). - SetMonitorLogID(id). SaveX(*verifier.DB.Ctx) service := serv.QueryService().OnlyX(*verifier.DB.Ctx) From e00ac0c9f339c0b46d1b800a855ca1fa65d729a5 Mon Sep 17 00:00:00 2001 From: akakou Date: Fri, 11 Oct 2024 16:45:46 +0900 Subject: [PATCH 3/8] fix: table contents --- verifier/serv/static/js/ui/table.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/verifier/serv/static/js/ui/table.js b/verifier/serv/static/js/ui/table.js index 43b2459e..11e19f04 100644 --- a/verifier/serv/static/js/ui/table.js +++ b/verifier/serv/static/js/ui/table.js @@ -1,17 +1,22 @@ const TableCompornent = ({ logs }) => { + const gitRepo = s => `${s.edges.code.repository}/tree/${s.edges.code.commit_id}` + const rows = logs.map((server, index) => {index + 1} {server.domain} - {server.edges.code.repository} - {server.edges.code.commit_id} {server.edges.code.unique_id} + + + {server.server.monitor_log_id} + + + + {gitRepo(server)} + {(!!server.is_active).toString()} - Go to Repo ); @@ -21,11 +26,10 @@ const TableCompornent = ({ logs }) => { Index Domain - Repository - Commit_ID Unique ID + crt.sh ID + Git Repository Activated - Repository Link From 19e00515b17fc1913231385ffd6220e063f9bca0 Mon Sep 17 00:00:00 2001 From: akakou Date: Fri, 11 Oct 2024 16:58:07 +0900 Subject: [PATCH 4/8] fix: set monitor log id --- verifier/api/register.go | 1 + 1 file changed, 1 insertion(+) diff --git a/verifier/api/register.go b/verifier/api/register.go index 94d445b7..1cf86866 100644 --- a/verifier/api/register.go +++ b/verifier/api/register.go @@ -127,6 +127,7 @@ func RegisterServer(req *core.ServerRequest, code *ent.TACode, service *ent.Serv SetCode(code). SetPublicKey(req.PublicKey). SetQuote(req.Quote). + SetMonitorLogID(0). SetIsActive(false) _, err := taServerCreate.Save(*verifier.DB.Ctx) From c512d12a181e668cf3cdafffb8a835849b3866d5 Mon Sep 17 00:00:00 2001 From: akakou Date: Fri, 11 Oct 2024 17:04:47 +0900 Subject: [PATCH 5/8] fix: `server.server.monitor_log_id` =>`server.monitor_log_id` --- verifier/serv/static/js/ui/table.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/verifier/serv/static/js/ui/table.js b/verifier/serv/static/js/ui/table.js index 11e19f04..ceff6646 100644 --- a/verifier/serv/static/js/ui/table.js +++ b/verifier/serv/static/js/ui/table.js @@ -9,8 +9,8 @@ const TableCompornent = ({ logs }) => { {server.domain} {server.edges.code.unique_id} - - {server.server.monitor_log_id} + + {server.monitor_log_id} From 46c89d719ae969090bf322f865915f8f836a22a7 Mon Sep 17 00:00:00 2001 From: akakou Date: Fri, 11 Oct 2024 22:41:08 +0900 Subject: [PATCH 6/8] feat: usable adversary --- test/adversary_example/main.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/adversary_example/main.go b/test/adversary_example/main.go index 0f8f4962..e15d4712 100644 --- a/test/adversary_example/main.go +++ b/test/adversary_example/main.go @@ -2,6 +2,7 @@ package main import ( "crypto/tls" + "fmt" "net/http" "github.com/labstack/echo/v4" @@ -9,11 +10,16 @@ import ( "golang.org/x/crypto/acme/autocert" ) +var VerifierBase = "https://rare-charter-vancouver-many.trycloudflare.com" + func main() { e := echo.New() + body := "
" + body = fmt.Sprintf(body, VerifierBase) + e.GET("/", func(c echo.Context) error { - return c.String(http.StatusOK, "Hello, World!") + return c.HTML(http.StatusOK, body) }) autoTLSManager := autocert.Manager{ From 56343617213b3bf73189951f077eefd1f07875a1 Mon Sep 17 00:00:00 2001 From: akakou Date: Fri, 11 Oct 2024 22:43:21 +0900 Subject: [PATCH 7/8] fix: test code --- verifier/monitor/check_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/verifier/monitor/check_test.go b/verifier/monitor/check_test.go index ccd9444e..48199619 100644 --- a/verifier/monitor/check_test.go +++ b/verifier/monitor/check_test.go @@ -45,7 +45,7 @@ func testPass(t *testing.T) { priv, _ := rsa.GenerateKey(rand.Reader, 2048) keyBuf := x509.MarshalPKCS1PublicKey(&priv.PublicKey) - server := verifier.DB.Client.TAServer.Create().SetDomain("example.com").SetPublicKey(keyBuf).SetQuote("1").SetIsActive(false).SaveX(*verifier.DB.Ctx) + server := verifier.DB.Client.TAServer.Create().SetDomain("example.com").SetPublicKey(keyBuf).SetQuote("1").SetMonitorLogID(0).SetIsActive(false).SaveX(*verifier.DB.Ctx) verifier.DB.Client.TACode.Create().SetUniqueID([]byte{1, 2, 3}).SetRepository("").SetCommitID("").SaveX(*verifier.DB.Ctx) err := Check(&priv.PublicKey, server) From 4b2d8aa8850c26d17a589c0e4e0bd5bb6b0e6ceb Mon Sep 17 00:00:00 2001 From: akakou Date: Fri, 11 Oct 2024 22:44:16 +0900 Subject: [PATCH 8/8] refactor: remove checked test code --- verifier/api/server_test.go | 71 ------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 verifier/api/server_test.go diff --git a/verifier/api/server_test.go b/verifier/api/server_test.go deleted file mode 100644 index 2543c323..00000000 --- a/verifier/api/server_test.go +++ /dev/null @@ -1,71 +0,0 @@ -package api - -// func TestTAFromDomainAPI(t *testing.T) { -// e := echo.New() -// e.Debug = true -// ttp, err := ttp.DefaultVerifier() -// assert.NoError(t, err) - -// domain := "example.com" - -// servicer := ttp.DB.Client.Service.Create(). -// SetName(""). -// SetToken(""). -// SetIsActive(true). -// SaveX(*ttp.DB.Ctx) - -// code := ttp.DB.Client.TACode.Create(). -// SetUniqueID([]byte("1234")). -// SetCommitID("1234"). -// SetRepository("https://example.com"). -// SetIsActive(true). -// SaveX(*ttp.DB.Ctx) - -// server := ttp.DB.Client.TAServer.Create(). -// SetDomain(domain). -// SetService(servicer). -// SetCode(code). -// SetPublicKey([]byte("1234")). -// SetQuote("1234"). -// SetHasActivated(true). -// SaveX(*ttp.DB.Ctx) - -// violation := ttp.DB.Client.TAViolation.Create(). -// SetServer(server). -// SaveX(*ttp.DB.Ctx) - -// req := httptest.NewRequest(http.MethodGet, "/api/server/"+domain, strings.NewReader("")) -// req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON) -// rec := httptest.NewRecorder() -// c := e.NewContext(req, rec) -// c.SetPath("/api/server/:domain") -// c.SetParamNames("domain") -// c.SetParamValues(domain) - -// err = GetServerFromDomainApi.F(verifier)(c) - -// assert.NoError(t, err) -// assert.Equal(t, 200, c.Response().Status) - -// bytes := rec.Body.Bytes() -// assert.NoError(t, err) - -// respTa := []ent.TAServer{} -// err = json.Unmarshal(bytes, &respTa) -// assert.NoError(t, err) - -// assert.Equal(t, server.ID, respTa[0].ID) -// assert.Equal(t, server.PublicKey, respTa[0].PublicKey) -// assert.Equal(t, server.Quote, respTa[0].Quote) - -// assert.Equal(t, code.ID, respTa[0].Edges.Code.ID) -// assert.Equal(t, code.UniqueID, respTa[0].Edges.Code.UniqueID) -// assert.Equal(t, code.CommitID, respTa[0].Edges.Code.CommitID) -// assert.Equal(t, code.Repository, respTa[0].Edges.Code.Repository) -// assert.Equal(t, code.IsActive, respTa[0].Edges.Code.IsActive) - -// assert.Equal(t, violation.ID, respTa[0].Edges.Violation[0].ID) - -// // t.Errorf("%v", string(bytes)) - -// }