{"header":{"message":"users: Introduce User guard for routes\n\nRockets guards are very powerful to disallow users for certain routes. This far\nthis wasn't implemented, and allowed no-one other than the first user to sign\nup. This change introduces the User guard and employs it for a few routes.\n\nThe guard works by checking the encrypted cookie for the user_id, and perform\na database lookup on it.\n","description":null,"timestamp":"2021-09-13T19:12:29.321045Z","authors":[{}]},"hash":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC","authors":[{"login":"zj","key":"HJTTxR4pkDDL4TSRKMxQ3hWM2wopn7HM1y1hFeYKuzA2"}],"deps":{"hashes":[["DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC","users: Introduce User guard for routes\n\nRockets guards are very powerful to disallow users for certain routes. This far\nthis wasn't implemented, and allowed no-one other than the first user to sign\nup. This change introduces the User guard and employs it for a few routes.\n\nThe guard works by checking the encrypted cookie for the user_id, and perform\na database lookup on it.\n"],["AA",null],["KULVODXDL6KFQDLXYAAM3YPYNUMTRWV3LP6NRTYUHU7XBM2OKYZAC","routes: User route mod exposes routes() now\n\nOther routes already did this to keep the routes clean\nwhen mounting. Now the user routes do too.\n"],["T7TT5B4G3RBWVEG3BK6TPZQJJ3PSBBUZZCNBUM5KWYPVVPJ2VKAAC","models: Put User model in their own file\n\nBefore adding a next model, let's start organizing the code a little, to make\nextending easier.\n"],["TWIZ7QV4GCTQK743IKZSOJCIAEX62GZHFIYGOIFCFGIBOGPSY2WAC","db: Add interface to add a project\n\nRight now a project has a name, and an owner which is hardcoded\nto 1. This is because basically I'm speedrunning to implement push/pull\nof Pijul and then revisit to add depth to features and tests.\n\nModel code is now split into files properly too.\n"],["FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC","pijul: Start of push/pull work\n\nThis change includes one API endpoint, .pijul. It allows for getting a channels\nremote ID. A lot of plumbing around repositories is added too, from init to\nopening pristine and actions like it.\n"],["5UNA2DEALCSRBINR27KSA6OMD6GQAXHYZ35ICQ7NB62G2XP4FT5QC","routes: Register and authenticate users\n\nAllow users to sign up, and sign in/sign out. The routes are added, though the\ndesign of the pages is very bare bones still, it's hard to go through the full\nflow to demo.\n\nOn the server side: Passwords are stored encrypted in the database with salts.\nThis uses the PG encrypt tooling to prevent against bugs and maintainance costs\non this project. When a user is signed in, the user ID is set in a private\ncookie.\n\nRocket has Guards for routes, which has not been implemented yet for this\nproject.\n"]],"deps":["KULVODXDL6KFQDLXYAAM3YPYNUMTRWV3LP6NRTYUHU7XBM2OKYZAC"],"known":["5UNA2DEALCSRBINR27KSA6OMD6GQAXHYZ35ICQ7NB62G2XP4FT5QC","T7TT5B4G3RBWVEG3BK6TPZQJJ3PSBBUZZCNBUM5KWYPVVPJ2VKAAC","TWIZ7QV4GCTQK743IKZSOJCIAEX62GZHFIYGOIFCFGIBOGPSY2WAC","FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":2336},"path":"src/users.rs","line":3,"ins":{"up_context":[{"change":3,"pos":2378}],"down_context":[{"change":3,"pos":2409}],"flag":"BLOCK","start":0,"end":89,"inode":{"change":3,"pos":2336}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2378},"to":{"change":3,"start":2378,"end":2409},"introduced_by":3}],"inode":{"change":3,"pos":2336}},"ins_contents":[{"Add":{"text":" http::{Cookie, CookieJar, Status},","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:38"}},{"Add":{"text":" request,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:51"}},{"Add":{"text":" request::{FromRequest, Outcome},","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:88"}}],"del_contents":[{"Del":{"text":" http::{Cookie, CookieJar},","pos":"5UNA2DEALCSRBINR27KSA6OMD6GQAXHYZ35ICQ7NB62G2XP4FT5QC:2408"}}]}},{"Replacement":{"inode":{"change":3,"pos":2336},"path":"src/users.rs","line":7,"ins":{"up_context":[{"change":3,"pos":2442}],"down_context":[{"change":3,"pos":2453}],"flag":"BLOCK","start":90,"end":117,"inode":{"change":3,"pos":2336}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2442},"to":{"change":2,"start":0,"end":18},"introduced_by":2}],"inode":{"change":3,"pos":2336}},"ins_contents":[{"Add":{"text":" Request, Route, State,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:116"}}],"del_contents":[{"Del":{"text":" Route, State,","pos":"KULVODXDL6KFQDLXYAAM3YPYNUMTRWV3LP6NRTYUHU7XBM2OKYZAC:17"}}]}},{"Edit":{"inode":{"change":3,"pos":2336},"path":"src/users.rs","line":13,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":32}],"down_context":[{"change":3,"pos":2543}],"flag":"BLOCK","start":118,"end":153,"inode":{"change":3,"pos":2336}}},"contents":[{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:118"}},{"Add":{"text":"use rocket::outcome::try_outcome;","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:152"}}]}},{"Replacement":{"inode":{"change":3,"pos":2336},"path":"src/users.rs","line":16,"ins":{"up_context":[{"change":3,"pos":2544}],"down_context":[{"change":2,"pos":19}],"flag":"BLOCK","start":154,"end":945,"inode":{"change":3,"pos":2336}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2544},"to":{"change":3,"start":2544,"end":2559},"introduced_by":3}],"inode":{"change":3,"pos":2336}},"ins_contents":[{"Add":{"text":"// TODO decide if this routing file is the place for this guard to be at?","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:227"}},{"Add":{"text":"#[rocket::async_trait]","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:250"}},{"Add":{"text":"impl<'r> FromRequest<'r> for User {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:286"}},{"Add":{"text":" type Error = ();","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:307"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:308"}},{"Add":{"text":" async fn from_request(request: &'r Request<'_>) -> request::Outcome {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:401"}},{"Add":{"text":" let db = try_outcome!(request.guard::<&State>().await);","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:475"}},{"Add":{"text":" // &State>().await);","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:525"}},{"Add":{"text":" let cookies = request.cookies();","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:566"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:567"}},{"Add":{"text":" let some_id = match get_user_id_from_cookie(cookies) {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:630"}},{"Add":{"text":" Some(id) => id,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:658"}},{"Add":{"text":" None => return Outcome::Failure((Status::Unauthorized, ())),","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:731"}},{"Add":{"text":" };","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:742"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:743"}},{"Add":{"text":" match User::find(db, some_id).await {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:789"}},{"Add":{"text":" Ok(u) => Outcome::Success(u),","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:831"}},{"Add":{"text":" Err(_e) => Outcome::Failure((Status::Unauthorized, ())),","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:900"}},{"Add":{"text":" }","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:910"}},{"Add":{"text":" }","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:916"}},{"Add":{"text":"}","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:918"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:919"}},{"Add":{"text":"#[get(\"/new\", rank = 2)]","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:944"}}],"del_contents":[{"Del":{"text":"#[get(\"/new\")]","pos":"5UNA2DEALCSRBINR27KSA6OMD6GQAXHYZ35ICQ7NB62G2XP4FT5QC:2558"}}]}},{"Edit":{"inode":{"change":3,"pos":2336},"path":"src/users.rs","line":43,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2648}],"down_context":[{"change":3,"pos":2648}],"flag":"BLOCK","start":946,"end":1043,"inode":{"change":3,"pos":2336}}},"contents":[{"Add":{"text":"#[get(\"/new\", rank = 1)]","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:970"}},{"Add":{"text":"fn new_already_user(_user: User) -> Redirect {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1017"}},{"Add":{"text":" Redirect::to(\"/\")","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1039"}},{"Add":{"text":"}","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1041"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1042"}}]}},{"Edit":{"inode":{"change":3,"pos":2336},"path":"src/users.rs","line":134,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":5288}],"down_context":[{"change":3,"pos":5288}],"flag":"BLOCK","start":1044,"end":1243,"inode":{"change":3,"pos":2336}}},"contents":[{"Add":{"text":"}","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1045"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1046"}},{"Add":{"text":"fn get_user_id_from_cookie(jar: &CookieJar) -> Option {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1107"}},{"Add":{"text":" match jar.get_private(COOKIE_USER_ID_KEY) {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1155"}},{"Add":{"text":" Some(id) => Some(id.value().parse::().ok()?),","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1214"}},{"Add":{"text":" None => None,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1236"}},{"Add":{"text":" }","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1242"}}]}},{"Replacement":{"inode":{"change":3,"pos":2336},"path":"src/users.rs","line":144,"ins":{"up_context":[{"change":2,"pos":241}],"down_context":[{"change":2,"pos":298}],"flag":"BLOCK","start":1244,"end":1373,"inode":{"change":3,"pos":2336}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":241},"to":{"change":2,"start":241,"end":298},"introduced_by":2}],"inode":{"change":3,"pos":2336}},"ins_contents":[{"Add":{"text":" routes![","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1256"}},{"Add":{"text":" new,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1269"}},{"Add":{"text":" new_already_user,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1295"}},{"Add":{"text":" create,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1311"}},{"Add":{"text":" get_sign_in,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1332"}},{"Add":{"text":" sign_in,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1349"}},{"Add":{"text":" sign_out","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1366"}},{"Add":{"text":" ]","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1372"}}],"del_contents":[{"Del":{"text":" routes![new, create, get_sign_in, sign_in, sign_out]","pos":"KULVODXDL6KFQDLXYAAM3YPYNUMTRWV3LP6NRTYUHU7XBM2OKYZAC:297"}}]}},{"Edit":{"inode":{"change":3,"pos":597},"path":"src/projects.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":629}],"down_context":[{"change":3,"pos":667}],"flag":"BLOCK","start":1374,"end":1406,"inode":{"change":3,"pos":597}}},"contents":[{"Add":{"text":"use crate::models::users::User;","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1405"}}]}},{"Replacement":{"inode":{"change":3,"pos":597},"path":"src/projects.rs","line":13,"ins":{"up_context":[{"change":3,"pos":875}],"down_context":[{"change":3,"pos":898}],"flag":"BLOCK","start":1407,"end":1441,"inode":{"change":3,"pos":597}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":875},"to":{"change":3,"start":875,"end":898},"introduced_by":3}],"inode":{"change":3,"pos":597}},"ins_contents":[{"Add":{"text":"fn new(_user: User) -> Template {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1440"}}],"del_contents":[{"Del":{"text":"fn new() -> Template {","pos":"TWIZ7QV4GCTQK743IKZSOJCIAEX62GZHFIYGOIFCFGIBOGPSY2WAC:897"}}]}},{"Edit":{"inode":{"change":3,"pos":597},"path":"src/projects.rs","line":43,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1517}],"down_context":[{"change":3,"pos":1517}],"flag":"BLOCK","start":1442,"end":1458,"inode":{"change":3,"pos":597}}},"contents":[{"Add":{"text":" user: User,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1457"}}]}},{"Replacement":{"inode":{"change":3,"pos":597},"path":"src/projects.rs","line":46,"ins":{"up_context":[{"change":3,"pos":302}],"down_context":[{"change":3,"pos":1736}],"flag":"BLOCK","start":1459,"end":1529,"inode":{"change":3,"pos":597}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":302},"to":{"change":3,"start":302,"end":366},"introduced_by":3}],"inode":{"change":3,"pos":597}},"ins_contents":[{"Add":{"text":" match projects::create(db, user.id, project.name.clone()).await {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1528"}}],"del_contents":[{"Del":{"text":" match projects::create(db, 1, project.name.clone()).await {","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:365"}}]}},{"Replacement":{"inode":{"change":3,"pos":400},"path":"src/pijul.rs","line":6,"ins":{"up_context":[{"change":3,"pos":519}],"down_context":[{"change":3,"pos":562}],"flag":"BLOCK","start":1530,"end":1942,"inode":{"change":3,"pos":400}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":519},"to":{"change":3,"start":519,"end":539},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":539},"to":{"change":3,"start":539,"end":562},"introduced_by":3}],"inode":{"change":3,"pos":400}},"ins_contents":[{"Add":{"text":"/// Because of the overlap with other routes in parameters, this route has","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1604"}},{"Add":{"text":"/// rank 2. This way the changelist matches first, and if it doesn't, this route","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1685"}},{"Add":{"text":"/// will respond. Note that in the push flow this order is reversed.","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1754"}},{"Add":{"text":"#[get(\"///.pijul?&\", rank = 2)]","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1820"}},{"Add":{"text":"async fn remote_id(","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1840"}},{"Add":{"text":" db: &State,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1866"}},{"Add":{"text":" repoman: &State,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1896"}},{"Add":{"text":" org_path: String,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1918"}},{"Add":{"text":" proj_path: String,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1941"}}],"del_contents":[{"Del":{"text":"#[derive(FromForm)]","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:538"}},{"Del":{"text":"struct ChangelistReq {","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:561"}}]}},{"Edit":{"inode":{"change":3,"pos":400},"path":"src/pijul.rs","line":17,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":655}],"down_context":[{"change":3,"pos":655}],"flag":"BLOCK","start":1943,"end":2273,"inode":{"change":3,"pos":400}}},"contents":[{"Add":{"text":") -> Option {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:1964"}},{"Add":{"text":" let p = match projects::find(db, org_path, proj_path).await {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2030"}},{"Add":{"text":" Some(p) => p,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2052"}},{"Add":{"text":" None => return None,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2081"}},{"Add":{"text":" };","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2088"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2089"}},{"Add":{"text":" match p.repository(&repoman.storage_root) {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2137"}},{"Add":{"text":" Ok(r) => r.channel_remote_id(channel, id),","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2188"}},{"Add":{"text":" Err(e) => {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2208"}},{"Add":{"text":" println!(\"{}\", e);","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2239"}},{"Add":{"text":" None","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2256"}},{"Add":{"text":" }","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2266"}},{"Add":{"text":" }","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2272"}}]}},{"Replacement":{"inode":{"change":3,"pos":400},"path":"src/pijul.rs","line":32,"ins":{"up_context":[{"change":3,"pos":658}],"down_context":[{"change":3,"pos":750}],"flag":"BLOCK","start":2274,"end":2338,"inode":{"change":3,"pos":400}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":658},"to":{"change":3,"start":658,"end":698},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":698},"to":{"change":3,"start":698,"end":750},"introduced_by":3}],"inode":{"change":3,"pos":400}},"ins_contents":[{"Add":{"text":"#[get(\"///.pijul?&\")]","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2337"}}],"del_contents":[{"Del":{"text":"// TODO is this for push and/or pull???","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:697"}},{"Del":{"text":"#[get(\"///.pijul?\")]","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:749"}}]}},{"Replacement":{"inode":{"change":3,"pos":400},"path":"src/pijul.rs","line":38,"ins":{"up_context":[{"change":3,"pos":872}],"down_context":[{"change":3,"pos":899}],"flag":"BLOCK","start":2339,"end":2429,"inode":{"change":3,"pos":400}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":872},"to":{"change":3,"start":872,"end":899},"introduced_by":3}],"inode":{"change":3,"pos":400}},"ins_contents":[{"Add":{"text":" channel: String, // TODO check if this breaks non-UTF-8 channels","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2407"}},{"Add":{"text":" changelist: u64,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2428"}}],"del_contents":[{"Del":{"text":" cl_req: ChangelistReq,","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:898"}}]}},{"Replacement":{"inode":{"change":3,"pos":400},"path":"src/pijul.rs","line":47,"ins":{"up_context":[{"change":3,"pos":1094}],"down_context":[{"change":3,"pos":1148}],"flag":"BLOCK","start":2430,"end":2487,"inode":{"change":3,"pos":400}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1094},"to":{"change":3,"start":1094,"end":1148},"introduced_by":3}],"inode":{"change":3,"pos":400}},"ins_contents":[{"Add":{"text":" Ok(r) => r.changelist(channel, changelist).ok(),","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2486"}}],"del_contents":[{"Del":{"text":" Ok(r) => r.channel_remote_id(cl_req.channel),","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:1147"}}]}},{"Replacement":{"inode":{"change":3,"pos":400},"path":"src/pijul.rs","line":49,"ins":{"up_context":[{"change":3,"pos":1168}],"down_context":[{"change":3,"pos":1199}],"flag":"BLOCK","start":2488,"end":2545,"inode":{"change":3,"pos":400}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1168},"to":{"change":3,"start":1168,"end":1199},"introduced_by":3}],"inode":{"change":3,"pos":400}},"ins_contents":[{"Add":{"text":" println!(\"error getting changelist: {}\", e);","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2544"}}],"del_contents":[{"Del":{"text":" println!(\"{}\", e);","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:1198"}}]}},{"Edit":{"inode":{"change":3,"pos":400},"path":"src/pijul.rs","line":53,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1232},"to":{"change":3,"start":1232,"end":1275},"introduced_by":3}],"inode":{"change":3,"pos":400}}},"contents":[{"Del":{"text":" // - Reverse engineer the rest of Push","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:1274"}}]}},{"Replacement":{"inode":{"change":3,"pos":400},"path":"src/pijul.rs","line":56,"ins":{"up_context":[{"change":3,"pos":1310}],"down_context":[{"change":3,"pos":1334}],"flag":"BLOCK","start":2546,"end":2581,"inode":{"change":3,"pos":400}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1310},"to":{"change":3,"start":1310,"end":1334},"introduced_by":3}],"inode":{"change":3,"pos":400}},"ins_contents":[{"Add":{"text":" routes![remote_id, changelist]","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2580"}}],"del_contents":[{"Del":{"text":" routes![changelist]","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:1333"}}]}},{"Edit":{"inode":{"change":3,"pos":2044},"path":"src/models/users.rs","line":18,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2407}],"down_context":[{"change":3,"pos":2407}],"flag":"BLOCK","start":2582,"end":2787,"inode":{"change":3,"pos":2044}}},"contents":[{"Add":{"text":" pub async fn find(db: &State, id: i32) -> Result {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2665"}},{"Add":{"text":" query_as!(User, \"SELECT * FROM users WHERE id = $1\", id)","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2730"}},{"Add":{"text":" .fetch_one(&**db)","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2760"}},{"Add":{"text":" .await","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2779"}},{"Add":{"text":" }","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2785"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2786"}}]}},{"Edit":{"inode":{"change":3,"pos":2571},"path":"src/models/pijul/repositories.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2642}],"down_context":[{"change":3,"pos":2642}],"flag":"BLOCK","start":2788,"end":2810,"inode":{"change":3,"pos":2571}}},"contents":[{"Add":{"text":"use libpijul::Base32;","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2809"}}]}},{"Edit":{"inode":{"change":3,"pos":2571},"path":"src/models/pijul/repositories.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2685}],"down_context":[{"change":3,"pos":2685}],"flag":"BLOCK","start":2811,"end":2834,"inode":{"change":3,"pos":2571}}},"contents":[{"Add":{"text":"use libpijul::TxnTExt;","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2833"}}]}},{"Replacement":{"inode":{"change":3,"pos":2571},"path":"src/models/pijul/repositories.rs","line":72,"ins":{"up_context":[{"change":3,"pos":4541}],"down_context":[{"change":3,"pos":4614}],"flag":"BLOCK","start":2835,"end":2929,"inode":{"change":3,"pos":2571}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4541},"to":{"change":3,"start":4541,"end":4614},"introduced_by":3}],"inode":{"change":3,"pos":2571}},"ins_contents":[{"Add":{"text":" pub fn channel_remote_id(&self, channel: String, _id: Option) -> Option {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2928"}}],"del_contents":[{"Del":{"text":" pub fn channel_remote_id(&self, channel: String) -> Option {","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:4613"}}]}},{"Edit":{"inode":{"change":3,"pos":2571},"path":"src/models/pijul/repositories.rs","line":80,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4857},"to":{"change":3,"start":4857,"end":4868},"introduced_by":3}],"inode":{"change":3,"pos":2571}}},"contents":[{"Del":{"text":" //","pos":"FS2NWBVN2SZB2FFPB3JSYT5URTVZEAZWMQ7QW4JUYPNJVDVAJTTQC:4867"}}]}},{"Edit":{"inode":{"change":3,"pos":2571},"path":"src/models/pijul/repositories.rs","line":93,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":5177}],"down_context":[{"change":3,"pos":5177}],"flag":"BLOCK","start":2930,"end":3851,"inode":{"change":3,"pos":2571}}},"contents":[{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:2930"}},{"Add":{"text":" // TODO figure out how to stream the response, instead of allocating all now","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3011"}},{"Add":{"text":" pub fn changelist(&self, channel: String, from: u64) -> Result {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3103"}},{"Add":{"text":" let txn = self.pristine()?.mut_txn_begin()?;","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3156"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3157"}},{"Add":{"text":" // TODO validate the txn needs closing?","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3205"}},{"Add":{"text":" // TODO validate the txn needs closing?","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3253"}},{"Add":{"text":" //","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3264"}},{"Add":{"text":" // Or does the drop function do that?","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3310"}},{"Add":{"text":" let chan = match txn.load_channel(&channel)? {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3365"}},{"Add":{"text":" Some(c) => c,","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3391"}},{"Add":{"text":" None => bail!(\"failed to read channel transaction\"),","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3456"}},{"Add":{"text":" };","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3467"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3468"}},{"Add":{"text":" let mut out: String = \"\".to_string();","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3514"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3515"}},{"Add":{"text":" for change in txn.log(&chan.read(), from)? {","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3568"}},{"Add":{"text":" let (offset, (hash, merkle)) = change?;","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3620"}},{"Add":{"text":" let h: libpijul::Hash = hash.into();","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3669"}},{"Add":{"text":" let m: libpijul::Merkle = merkle.into();","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3722"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3723"}},{"Add":{"text":" out.push_str(format!(\"{}.{}.{}\", offset, h.to_base32(), m.to_base32()).as_str());","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3817"}},{"Add":{"text":" }","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3827"}},{"Add":{"text":"","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3828"}},{"Add":{"text":" Ok(out)","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3844"}},{"Add":{"text":" }","pos":"DSWQKJRHGLKXUDXKMRXCIQZKEGXYV3H5LPUMGSV4HQ4HYPTI47GQC:3850"}}]}}],"owner":"zj","repo":"nidobyte","token":"S1fq54sKOm4hRh809V/Ie9YJYT7Jhqvr4w8AXj3l3Bs=","login":null}

…

Dependencies

Change contents

Review