Commit a49d1038 authored by jan.koester's avatar jan.koester
Browse files

test

parent 2222d167

patch_blogi.sh

+4 −3
Original line number Diff line number Diff line 
sed -i 's/bool canEditOwn    = checkGPO(GPO_CONTENT_EDIT_OWN);/\

bool canEditOwn    = checkGPO(GPO_CONTENT_EDIT_OWN);\

std::cout << "DEBUG: authid=" << authid << ", uid=" << uid << ", currentAuthor=" << currentAuthor << ", canEditOwn=" << canEditOwn << ", canDelOwn=" << canDelOwn << std::endl;/' /home/intranet.tuxist.de/jan.koester/Projects/blogi/plugins/content/content.cpp
 
sed -i 's/\} catch(...) { continue; }/\

} catch(authdb::AuthBackendError \&e) { std::cerr << "AuthBackendError: " << e.what() << std::endl; continue; }\

  catch(std::exception \&e) { std::cerr << "Exception: " << e.what() << std::endl; continue; }\

  catch(...) { std::cerr << "Unknown exception" << std::endl; continue; }/' /home/intranet.tuxist.de/jan.koester/Projects/blogi/plugins/content/content.cpp

plugins/content/content.cpp

+24 −6
Original line number Diff line number Diff line
@@ -342,7 +342,10 @@ namespace blogi { 
                                            canDelete = true;

                                    }

                                }

                            } catch(...) { continue; }

                            

} catch(authdb::AuthBackendError &e) { std::cerr << "AuthBackendError: " << e.what() << std::endl; continue; }

  catch(std::exception &e) { std::cerr << "Exception: " << e.what() << std::endl; continue; }

  catch(...) { std::cerr << "Unknown exception" << std::endl; continue; }

                            if(canEdit && canDelete) break;

                        }

                    }
@@ -434,7 +437,10 @@ namespace blogi { 
                                        if(clt.GPOcheck(uuid::uuid(GPO_CONTENT_COMMENT)))

                                            canComment = true;

                                    }

                                } catch(...) { continue; }

                                

} catch(authdb::AuthBackendError &e) { std::cerr << "AuthBackendError: " << e.what() << std::endl; continue; }

  catch(std::exception &e) { std::cerr << "Exception: " << e.what() << std::endl; continue; }

  catch(...) { std::cerr << "Unknown exception" << std::endl; continue; }

                                if(!displayName.empty()) break;

                            }

                        }
@@ -591,7 +597,10 @@ namespace blogi { 
                                       || clt.GPOcheck(uuid::uuid(GPO_CONTENT_MODERATE)))

                                        autoApprove = true;

                                }

                            } catch(...) { continue; }

                            

} catch(authdb::AuthBackendError &e) { std::cerr << "AuthBackendError: " << e.what() << std::endl; continue; }

  catch(std::exception &e) { std::cerr << "Exception: " << e.what() << std::endl; continue; }

  catch(...) { std::cerr << "Unknown exception" << std::endl; continue; }

                            if(!authorName.empty()) break;

                        }

                    }
@@ -972,7 +981,10 @@ namespace blogi { 
                                allowed = true;

                            }

                        }

                    } catch(...) { continue; }

                    

} catch(authdb::AuthBackendError &e) { std::cerr << "AuthBackendError: " << e.what() << std::endl; continue; }

  catch(std::exception &e) { std::cerr << "Exception: " << e.what() << std::endl; continue; }

  catch(...) { std::cerr << "Unknown exception" << std::endl; continue; }

                    if(allowed) break;

                }

            }
@@ -1115,7 +1127,10 @@ namespace blogi { 
                                    allowed = true;

                                }

                            }

                        } catch(...) { continue; }

                        

} catch(authdb::AuthBackendError &e) { std::cerr << "AuthBackendError: " << e.what() << std::endl; continue; }

  catch(std::exception &e) { std::cerr << "Exception: " << e.what() << std::endl; continue; }

  catch(...) { std::cerr << "Unknown exception" << std::endl; continue; }

                        if(allowed) break;

                    }

                }
@@ -1345,7 +1360,10 @@ namespace blogi { 
                        authdb::client::Client clt(authcon);

                        if(clt.ClientAuth() && clt.GPOcheck(uuid::uuid(gpoid)))

                            return true;

                    } catch(...) { continue; }

                    

} catch(authdb::AuthBackendError &e) { std::cerr << "AuthBackendError: " << e.what() << std::endl; continue; }

  catch(std::exception &e) { std::cerr << "Exception: " << e.what() << std::endl; continue; }

  catch(...) { std::cerr << "Unknown exception" << std::endl; continue; }

                }

                return false;

            };