diff --git a/cmd/xwebmail/xwebmail.go b/cmd/xwebmail/xwebmail.go new file mode 100644 index 0000000..ab2c377 --- /dev/null +++ b/cmd/xwebmail/xwebmail.go @@ -0,0 +1,45 @@ +package main + +import ( + "flag" + "net/http" + + "github.com/golang/glog" + "github.com/gorilla/mux" + + "xinu.tv/email/db" +) + +var addr = flag.String("addr", ":8080", "address:port to listen on") + +type handler struct { + c *db.Conn +} + +func (h *handler) OriginalHandler(w http.ResponseWriter, r *http.Request) { + var blob []byte + hash := mux.Vars(r)["hash"] + if err := h.c.OriginalBlobByHash(hash, &blob); err != nil { + glog.Fatal(err) + } + w.Header().Set("Content-Type", "text/plain") + if _, err := w.Write(blob); err != nil { + glog.Error(err) + } +} + +func main() { + defer glog.Flush() + flag.Parse() + + c, err := db.NewConn("") + if err != nil { + glog.Fatal(err) + } + + h := &handler{c: c} + + r := mux.NewRouter() + r.HandleFunc("/raw/{hash}", h.OriginalHandler) + glog.Fatal(http.ListenAndServe(*addr, r)) +} diff --git a/db/util.go b/db/util.go index 345be1c..25c5a93 100644 --- a/db/util.go +++ b/db/util.go @@ -14,22 +14,22 @@ var ( sslmode = flag.String("dbsslmode", "disable", "PostgreSQL sslmode setting") ) -type conn struct { +type Conn struct { *sql.DB } // NewDB creates connection to PostgreSQL DB. If dsn is empty, the flags // -dbuser, -dbname, -dbsslmode are used. -func NewConn(dsn string) (*conn, error) { +func NewConn(dsn string) (*Conn, error) { if dsn == "" { dsn = fmt.Sprintf("user=%s dbname=%s sslmode=%s", *user, *name, *sslmode) } db, err := sql.Open("postgres", dsn) - return &conn{DB: db}, err + return &Conn{DB: db}, err } -func (c *conn) OriginalBlobByHash(hash string, blob *[]byte) error { +func (c *Conn) OriginalBlobByHash(hash string, blob *[]byte) error { row := c.QueryRow(` SELECT blob