diff --git a/main.go b/main.go index fcae6ac..f0619d2 100644 --- a/main.go +++ b/main.go @@ -51,40 +51,40 @@ func cacheControl(next http.Handler) http.Handler { type RuleSet struct { Id int Name string - Default_contact_read int - Default_contact_write int - Default_contact_delete int - Default_keyword_read int - Default_keyword_write int - Default_keyword_delete int - Default_keyword_attach int - Default_keyword_detach int - Default_aduser_read int - Default_aduser_write int - Default_aduser_delete int - Default_location_read int - Default_location_write int - Default_location_delete int - Default_department_read int - Default_department_write int - Default_department_delete int - Self_contact_read int - Self_contact_write int - Self_keyword_attach int - Self_keyword_detach int - Private_contact_read int - Private_contact_write int - Private_keyword_add int - Private_keyword_delete int - Private_keyword_attach int - Private_keyword_detach int + Default_contact_read sql.NullInt64 + Default_contact_write sql.NullInt64 + Default_contact_delete sql.NullInt64 + Default_keyword_read sql.NullInt64 + Default_keyword_write sql.NullInt64 + Default_keyword_delete sql.NullInt64 + Default_keyword_attach sql.NullInt64 + Default_keyword_detach sql.NullInt64 + Default_aduser_read sql.NullInt64 + Default_aduser_write sql.NullInt64 + Default_aduser_delete sql.NullInt64 + Default_location_read sql.NullInt64 + Default_location_write sql.NullInt64 + Default_location_delete sql.NullInt64 + Default_department_read sql.NullInt64 + Default_department_write sql.NullInt64 + Default_department_delete sql.NullInt64 + Self_contact_read sql.NullInt64 + Self_contact_write sql.NullInt64 + Self_keyword_attach sql.NullInt64 + Self_keyword_detach sql.NullInt64 + Private_contact_read sql.NullInt64 + Private_contact_write sql.NullInt64 + Private_keyword_add sql.NullInt64 + Private_keyword_delete sql.NullInt64 + Private_keyword_attach sql.NullInt64 + Private_keyword_detach sql.NullInt64 } type ADUser struct { Id int SamAccountName string Sid string - RuleSetId RuleSet + RuleSetId sql.NullInt64 } type Department struct { @@ -102,21 +102,32 @@ type Location struct { type Contact struct { Id int - OwnerId int - AdUserId ADUser + OwnerId sql.NullInt64 + AdUserId sql.NullInt64 DisplayName string Phone string Mobile string Homeoffice string Email string Room string - DepartmentId Department - LocationId Location + DepartmentId sql.NullInt64 + LocationId sql.NullInt64 } type ContactKeywordLink struct { - Contact int - Keyword int + Contact sql.NullInt64 + Keyword sql.NullInt64 +} + +type Keyword struct { + Id int + Owner sql.NullInt64 + Name string +} + +type DataPort struct { + Contacts []Contact + Keywords []Keyword } /* ################################################################## */ @@ -125,13 +136,71 @@ type ContactKeywordLink struct { // ----- Example handlers ----- func (s *Server) publicHello(w http.ResponseWriter, r *http.Request) { - fmt.Fprintln(w, "Hallo an alle – öffentliche Daten") + fmt.Fprintln(w, "Hallo an alle - öffentliche Daten") } func (s *Server) privateHello(w http.ResponseWriter, r *http.Request) { user := r.Context().Value(userKey).(string) - fmt.Fprintf(w, "Hallo %s – hier deine persönlichen Daten", user) + fmt.Fprintf(w, "Hallo %s - hier deine persönlichen Daten", user) } +func GetDataReturnDataPort(QueryContact, QueryKeyword string) DataPort { + rows, err := DB.Query(QueryContact) + if err != nil { + fmt.Println("a", err) + } + var contList []Contact + for rows.Next() { + var c Contact + err = rows.Scan(&c.Id, &c.OwnerId, &c.AdUserId, &c.DisplayName, &c.Phone, &c.Mobile, &c.Homeoffice, &c.Email, &c.Room, &c.DepartmentId, &c.LocationId) + if err != nil { + fmt.Println("b", err) + } + contList = append(contList, c) + } + + rows1, err := DB.Query(QueryKeyword) + if err != nil { + fmt.Println("c", err) + } + var keywordList []Keyword + for rows1.Next() { + var c0 Keyword + err = rows1.Scan(&c0.Id, &c0.Owner, &c0.Name) + if err != nil { + fmt.Println("d", err) + } + keywordList = append(keywordList, c0) + } + return DataPort{Contacts: contList, Keywords: keywordList} +} + +func (s *Server) ListPublic(w http.ResponseWriter, r *http.Request) { + D := GetDataReturnDataPort("SELECT * FROM contact c WHERE c.contact_owner_id = -1;", "SELECT * FROM keyword c WHERE c.keyword_owner = -1;") + funcs := template.FuncMap{"now": time.Now} + templatesDir := getenv("BLOG_TEMPLATES_DIR", "./static/templates") + layout := template.Must(template.New("base").Funcs(funcs).ParseFiles(templatesDir + "/base.html")) + tplFull := template.Must(layout.Clone()) + template.Must(tplFull.Funcs(funcs).ParseFiles(templatesDir+"/kontaktliste.html", templatesDir+"/schlagwortliste.html")) + tplFull.ExecuteTemplate(w, "layout", D) + /*user := r.Context().Value(userKey).(string) + fmt.Fprintf(w, "Hallo %s - hier deine persönlichen Daten", user)*/ +} + +func (s *Server) ListPrivate(w http.ResponseWriter, r *http.Request) { + D := GetDataReturnDataPort("SELECT * FROM contact c WHERE c.contact_owner_id = -1 OR c.contact_owner_id = 1;", "SELECT * FROM keyword c WHERE c.keyword_owner = -1 OR c.keyword_owner = 1;") + funcs := template.FuncMap{"now": time.Now} + templatesDir := getenv("BLOG_TEMPLATES_DIR", "./static/templates") + layout := template.Must(template.New("base").Funcs(funcs).ParseFiles(templatesDir + "/base.html")) + tplFull := template.Must(layout.Clone()) + template.Must(tplFull.Funcs(funcs).ParseFiles(templatesDir+"/kontaktliste.html", templatesDir+"/schlagwortliste.html")) + tplFull.ExecuteTemplate(w, "layout", D) + /*user := r.Context().Value(userKey).(string) + fmt.Fprintf(w, "Hallo %s - hier deine persönlichen Daten", user)*/ +} + +var CFG Config +var DB *sql.DB + func main() { // Signal-Kanal einrichten @@ -150,32 +219,33 @@ func main() { staticDir := getenv("BLOG_STATIC_DIR", "./static") templatesDir := getenv("BLOG_TEMPLATES_DIR", "./static/templates") - cfg := Config{ + CFG = Config{ DSN: "hikos:hikos@tcp(10.10.5.31:3306)/hikos?parseTime=true", LDAPURL: "ldaps://ldaps.example.com:636", LDAPBindPattern: "uid=%s,ou=users,dc=example,dc=com", SessionTTL: 24 * time.Hour, } - db, err := sql.Open("mysql", cfg.DSN) + db, err := sql.Open("mysql", CFG.DSN) if err != nil { log.Fatal(err) } if err := db.Ping(); err != nil { log.Fatal(err) } + DB = db store := &SessionStore{DB: db} auth := &LDAPAuthenticator{ - URL: cfg.LDAPURL, - BindPattern: cfg.LDAPBindPattern, + URL: CFG.LDAPURL, + BindPattern: CFG.LDAPBindPattern, TLSConfig: &tls.Config{ MinVersion: tls.VersionTLS12, }, } srv := &Server{ - cfg: cfg, + cfg: CFG, sessions: store, auth: auth, } @@ -192,17 +262,26 @@ func main() { tplKontakt := template.Must(template.New("kontakt").Funcs(funcs).ParseFiles(templatesDir + "/kontaktliste.html")) tplSchlagwort := template.Must(template.New("kontakt").Funcs(funcs).ParseFiles(templatesDir + "/schlagwortliste.html")) + layoutSSO := template.Must(template.New("sso").Funcs(funcs).ParseFiles(templatesDir + "/login.html")) + mux := http.NewServeMux() mux.HandleFunc("/login", srv.loginHandler) //mux.Handle("/protected", srv.withAuth(http.HandlerFunc(srv.protectedHandler))) + mux.HandleFunc("/sso", func(w http.ResponseWriter, r *http.Request) { + layoutSSO.ExecuteTemplate(w, "sso", nil) + }) + mux.Handle("/hello", srv.authAware(true, http.HandlerFunc(srv.publicHello), http.HandlerFunc(srv.privateHello))) // Handler für / - mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + + mux.Handle("/", srv.authAware(false, http.HandlerFunc(srv.ListPublic), http.HandlerFunc(srv.ListPrivate))) + + /*mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { tplFull.ExecuteTemplate(w, "layout", nil) - }) + })*/ mux.HandleFunc("/htmx/kontakt", func(w http.ResponseWriter, r *http.Request) { if err := r.ParseForm(); err != nil { @@ -223,9 +302,10 @@ func main() { for rows.Next() { var c Contact err = rows.Scan(&c.Id) + contList = append(contList, c) } - tplKontakt.ExecuteTemplate(w, "kontakt", nil) + tplKontakt.ExecuteTemplate(w, "kontakt", contList) }) mux.HandleFunc("/htmx/kontaktbyschlagwort", func(w http.ResponseWriter, r *http.Request) { @@ -393,10 +473,21 @@ func (s *Server) loginHandler(w http.ResponseWriter, r *http.Request) { } user := strings.TrimSpace(r.Form.Get("username")) pass := r.Form.Get("password") - if err := s.auth.Authenticate(user, pass); err != nil { - http.Error(w, "invalid credentials", http.StatusUnauthorized) - return + + if 1 == 2 { + if err := s.auth.Authenticate(user, pass); err != nil { + http.Error(w, "invalid credentials", http.StatusUnauthorized) + return + } + } else { + if user == "admin" && pass == "admin" { + + } else { + http.Error(w, "invalid credentials", http.StatusUnauthorized) + return + } } + token, err := s.sessions.Create(user, s.cfg.SessionTTL) if err != nil { log.Println("cannot create session:", err) @@ -404,7 +495,7 @@ func (s *Server) loginHandler(w http.ResponseWriter, r *http.Request) { return } http.SetCookie(w, &http.Cookie{Name: "session_token", Value: token, Expires: time.Now().Add(s.cfg.SessionTTL), Path: "/", Secure: true, HttpOnly: true, SameSite: http.SameSiteStrictMode}) - fmt.Fprintln(w, "ok") + http.Redirect(w, r, "/", http.StatusMovedPermanently) } func (s *Server) withAuth(next http.Handler) http.Handler { diff --git a/static/templates/kontaktliste.html b/static/templates/kontaktliste.html index 65922b3..d314889 100644 --- a/static/templates/kontaktliste.html +++ b/static/templates/kontaktliste.html @@ -12,7 +12,7 @@ - Name + Name (Anmelden) Telefon Mobil Homeoffice @@ -22,15 +22,15 @@ - {{ range .Kontakte }} + {{ range .Contacts }} - {{ .Name }} - {{ .Telefon }} - {{ .Mobil }} - {{ .Homeoffice }} - {{ .Amt }} - {{ .Raum }} - {{ .Gebaeude }} + {{ if .DisplayName }}{{ .DisplayName }}{{ end }} + {{ if .Phone }}{{ .Phone }}{{ end }} + {{ if .Mobile }}{{ .Mobile }}{{ end }} + {{ if .Homeoffice }}{{ .Homeoffice }}{{ end }} + {{ if .DepartmentId.Valid }}{{ .DepartmentId.Int64 }}{{ end }} + {{ if .Room }}{{ .Room }}{{ end }} + {{ if .LocationId.Valid }}{{ .LocationId.Int64 }}{{ end }} {{ end }} diff --git a/static/templates/login.html b/static/templates/login.html new file mode 100644 index 0000000..e226269 --- /dev/null +++ b/static/templates/login.html @@ -0,0 +1,149 @@ +{{ define "sso" }} + + + + + Login + + + + + + + + +
+
+

Anmelden

+ +
+
+ + +
+ +
+ + +
+ + +
+ +
+ Passwort vergessen? +
+
+
+ + +{{ end }} \ No newline at end of file diff --git a/static/templates/schlagwortliste.html b/static/templates/schlagwortliste.html index fbddc82..4183ea2 100644 --- a/static/templates/schlagwortliste.html +++ b/static/templates/schlagwortliste.html @@ -10,7 +10,7 @@ - {{ range .Kontakte }} + {{ range .Keywords }} {{ .Name }} {{ end }}