Re: [pbs-devel] [PATCH proxmox-backup] fix #3038: check user before renewing ticket

[Dylan Whyte <d.whyte@proxmox.com>]

All working now, thanks!
> On 21.10.2020 08:43 Dietmar Maurer <dietmar@proxmox.com> wrote:
> 
>  
> This fix is not really correct. I applied it wit a followup patch.
> Please can you test my fix?
> 
> comments inline:
> 
> > On 10/20/2020 11:29 AM Dylan Whyte <d.whyte@proxmox.com> wrote:
> > 
> >  
> > Fixes a bug in which the userid of the ticket cache is updated,
> > when a user connects, but the ticket itself is not.
> > This means a newly connected user has a previously connected
> > user's ticket and thus, cannot do anything, as the client will
> > attempt to use the invalid ticket.
> > 
> > e.g. if john@pbs connected to the server first, followed by
> > mike@pbs, the following would be stored in the ticket cache.
> > 
> > {
> >   "localhost": {
> >     "mike@pbs": {
> >       "ticket": "PBS:john@pbs:AAAA",
> >       "timestamp": 1601039326,
> >       "token": "BBBB"
> >     }
> >   }
> > }
> > 
> > Signed-off-by: Dylan Whyte <d.whyte@proxmox.com>
> > ---
> >  src/client/http_client.rs | 12 +++++++-----
> >  1 file changed, 7 insertions(+), 5 deletions(-)
> > 
> > diff --git a/src/client/http_client.rs b/src/client/http_client.rs
> > index e3d18604..02a58c2d 100644
> > --- a/src/client/http_client.rs
> > +++ b/src/client/http_client.rs
> > @@ -219,11 +219,13 @@ fn store_ticket_info(prefix: &str, server: &str, username: &str, ticket: &str, t
> >  
> >      let empty = serde_json::map::Map::new();
> >      for (server, info) in data.as_object().unwrap_or(&empty) {
> > -        for (_user, uinfo) in info.as_object().unwrap_or(&empty) {
> > -            if let Some(timestamp) = uinfo["timestamp"].as_i64() {
> > -                let age = now - timestamp;
> > -                if age < ticket_lifetime {
> > -                    new_data[server][username] = uinfo.clone();
> > +        for (user, uinfo) in info.as_object().unwrap_or(&empty) {
> > +            if user == username {
> 
> not needed
> 
> > +                if let Some(timestamp) = uinfo["timestamp"].as_i64() {
> > +                    let age = now - timestamp;
> > +                    if age < ticket_lifetime {
> > +                        new_data[server][username] = uinfo.clone();
> 
>  new_data[server][user] = uinfo.clone();
> 
> > +                    }
> >                  }
> >              }
> >          }
> > -- 
> > 2.20.1
> > 
> > 
> > 
> > _______________________________________________
> > pbs-devel mailing list
> > pbs-devel@lists.proxmox.com
> > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel