back round 0 view raw

knotserver: add owners to known_dids #531

merged

opened by

oppi.li 3 months ago targeting master from push-lnvnxmxlqkux

this is a regression from the v1.8.0 release

Signed-off-by: oppiliappan me@oppi.li

options

unified split

Changed files

+14 -4

knotserver

routes.go

+14 -4

knotserver/routes.go

···

       195
        
       		}

     

       196
        
       

     

       197
        
       		// remove existing owner

     

       198
       -
       		err = h.e.RemoveKnotOwner(rbacDomain, existingOwner)

     

       199
       -
       		if err != nil {

     

       200
       -
       			return nil

     

       201
        
       		}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       202
        
       	default:

     

       203
        
       		return fmt.Errorf("more than one owner in DB, try deleting %q and starting over", h.c.Server.DBPath)

     

       204
        
       	}

     

       205
        
       

     

       206
       -
       	return h.e.AddKnotOwner(rbacDomain, cfgOwner)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       207
        
       }

···

       195
        
       		}

     

       196
        
       

     

       197
        
       		// remove existing owner

     

       198
       +
       		if err = h.db.RemoveDid(existingOwner); err != nil {

     

       199
       +
       			return err

     

       0
        
       
     

       200
        
       		}

     

       201
       +
       		if err = h.e.RemoveKnotOwner(rbacDomain, existingOwner); err != nil {

     

       202
       +
       			return err

     

       203
       +
       		}

     

       204
       +
       

     

       205
        
       	default:

     

       206
        
       		return fmt.Errorf("more than one owner in DB, try deleting %q and starting over", h.c.Server.DBPath)

     

       207
        
       	}

     

       208
        
       

     

       209
       +
       	if err = h.db.AddDid(cfgOwner); err != nil {

     

       210
       +
       		return fmt.Errorf("failed to add owner to DB: %w", err)

     

       211
       +
       	}

     

       212
       +
       	if err := h.e.AddKnotOwner(rbacDomain, cfgOwner); err != nil {

     

       213
       +
       		return fmt.Errorf("failed to add owner to RBAC: %w", err)

     

       214
       +
       	}

     

       215
       +
       

     

       216
       +
       	return nil

     

       217
        
       }