diff options
| -rw-r--r-- | conf.go | 36 | ||||
| -rw-r--r-- | core.go | 17 | ||||
| -rw-r--r-- | fetcher.go | 2 | ||||
| -rw-r--r-- | rddb.go | 455 | ||||
| -rw-r--r-- | session_store.go | 13 |
5 files changed, 18 insertions, 505 deletions
@@ -24,10 +24,6 @@ package rhimport -import ( - "github.com/vaughan0/go-ini" -) - type ImportParamDefaults struct { Channels uint NormalizationLevel int @@ -36,44 +32,14 @@ type ImportParamDefaults struct { } type Config struct { - configfile string RDXportEndpoint string TempDir string - dbHost string - dbUser string - dbPasswd string - dbDb string LocalFetchDir string ImportParamDefaults } -func getIniValue(file ini.File, section string, key string, dflt string) string { - value, ok := file.Get(section, key) - if ok { - return value - } - return dflt -} - -func (self *Config) readConfigFile() error { - file, err := ini.LoadFile(self.configfile) - if err != nil { - return err - } - - self.dbHost = getIniValue(file, "mySQL", "Hostname", "localhost") - self.dbUser = getIniValue(file, "mySQL", "Loginname", "rivendell") - self.dbPasswd = getIniValue(file, "mySQL", "Password", "letmein") - self.dbDb = getIniValue(file, "mySQL", "Database", "rivendell") - return nil -} - -func NewConfig(configfile, rdxportEndpoint, tempDir, localFetchDir string) (conf *Config, err error) { +func NewConfig(rdxportEndpoint, tempDir, localFetchDir string) (conf *Config) { conf = new(Config) - conf.configfile = configfile - if err = conf.readConfigFile(); err != nil { - return - } conf.RDXportEndpoint = rdxportEndpoint conf.TempDir = tempDir conf.LocalFetchDir = localFetchDir @@ -27,6 +27,7 @@ package rhimport import ( "fmt" "github.com/andelf/go-curl" + "helsinki.at/rhrd-go/rddb" "io/ioutil" "log" "os" @@ -63,7 +64,7 @@ type Result struct { type Context struct { conf *Config - rddb *RdDbChan + db *rddb.DBChan UserName string Password string Trusted bool @@ -86,10 +87,10 @@ type Context struct { Cancel <-chan bool } -func NewContext(conf *Config, rddb *RdDbChan) *Context { +func NewContext(conf *Config, db *rddb.DBChan) *Context { ctx := new(Context) ctx.conf = conf - ctx.rddb = rddb + ctx.db = db ctx.UserName = "" ctx.Password = "" ctx.Trusted = false @@ -157,28 +158,28 @@ func (ctx *Context) SanityCheck() error { } func (ctx *Context) getPassword(cached bool) (err error) { - ctx.Password, err = ctx.rddb.GetPassword(ctx.UserName, cached) + ctx.Password, err = ctx.db.GetPassword(ctx.UserName, cached) return } func (ctx *Context) getGroupOfCart() (err error) { - ctx.GroupName, err = ctx.rddb.GetGroupOfCart(ctx.Cart) + ctx.GroupName, err = ctx.db.GetGroupOfCart(ctx.Cart) return } func (ctx *Context) getShowInfo() (carts []uint, err error) { - ctx.GroupName, ctx.NormalizationLevel, ctx.AutotrimLevel, carts, err = ctx.rddb.GetShowInfo(ctx.ShowId) + ctx.GroupName, ctx.NormalizationLevel, ctx.AutotrimLevel, carts, err = ctx.db.GetShowInfo(ctx.ShowId) ctx.Channels = 2 ctx.UseMetaData = true return } func (ctx *Context) checkMusicGroup() (bool, error) { - return ctx.rddb.CheckMusicGroup(ctx.GroupName) + return ctx.db.CheckMusicGroup(ctx.GroupName) } func (ctx *Context) getMusicInfo() (err error) { - ctx.NormalizationLevel, ctx.AutotrimLevel, err = ctx.rddb.GetMusicInfo(ctx.GroupName) + ctx.NormalizationLevel, ctx.AutotrimLevel, err = ctx.db.GetMusicInfo(ctx.GroupName) ctx.Channels = 2 ctx.UseMetaData = true ctx.Cart = 0 @@ -259,7 +259,7 @@ func fetcherInit() { func checkPassword(ctx *Context, result *Result) (err error) { ok := false - if ok, err = ctx.rddb.CheckPassword(ctx.UserName, ctx.Password); err != nil { + if ok, err = ctx.db.CheckPassword(ctx.UserName, ctx.Password); err != nil { return } if !ok { diff --git a/rddb.go b/rddb.go deleted file mode 100644 index 4c9c6c8..0000000 --- a/rddb.go +++ /dev/null @@ -1,455 +0,0 @@ -// -// rhimportd -// -// The Radio Helsinki Rivendell Import Daemon -// -// -// Copyright (C) 2015-2016 Christian Pointner <equinox@helsinki.at> -// -// This file is part of rhimportd. -// -// rhimportd is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// any later version. -// -// rhimportd is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with rhimportd. If not, see <http://www.gnu.org/licenses/>. -// - -package rhimport - -import ( - "database/sql" - "fmt" - "github.com/ziutek/mymysql/godrv" - "regexp" - "strings" -) - -var ( - showMacroRe = regexp.MustCompile(`^LL 1 ([^ ]+) 0\!$`) - mysqlTableNameRe = regexp.MustCompile(`^[_0-9a-zA-Z-]+$`) -) - -const ( - DB_VERSION = 245 -) - -type getPasswordResult struct { - password string - err error -} - -type getPasswordRequest struct { - username string - cached bool - response chan<- getPasswordResult -} - -type getGroupOfCartResult struct { - group string - err error -} - -type getGroupOfCartRequest struct { - cart uint - response chan<- getGroupOfCartResult -} - -type getShowInfoResult struct { - title string - group string - carts []uint - normLvl int - trimLvl int - err error -} - -type getShowInfoRequest struct { - showid uint - response chan<- getShowInfoResult -} - -type checkMusicGroupResult struct { - ismusic bool - err error -} - -type checkMusicGroupRequest struct { - group string - response chan<- checkMusicGroupResult -} - -type getMusicInfoResult struct { - normLvl int - trimLvl int - err error -} - -type getMusicInfoRequest struct { - group string - response chan<- getMusicInfoResult -} - -type RdDb struct { - dbh *sql.DB - passwordCache map[string]string - getPasswordChan chan getPasswordRequest - getPasswordStmt *sql.Stmt - getGroupOfCartChan chan getGroupOfCartRequest - getGroupOfCartStmt *sql.Stmt - getShowInfoChan chan getShowInfoRequest - getShowInfoStmt *sql.Stmt - checkMusicGroupChan chan checkMusicGroupRequest - checkMusicGroupStmt *sql.Stmt - getMusicInfoChan chan getMusicInfoRequest - getMusicInfoStmt *sql.Stmt - quit chan bool - done chan bool -} - -func (self *RdDb) init(conf *Config) (err error) { - godrv.Register("SET CHARACTER SET utf8;") - - dsn := fmt.Sprintf("tcp:%s:3306*%s/%s/%s", conf.dbHost, conf.dbDb, conf.dbUser, conf.dbPasswd) - if self.dbh, err = sql.Open("mymysql", dsn); err != nil { - return - } - - var dbver int - err = self.dbh.QueryRow("select DB from VERSION;").Scan(&dbver) - if err != nil { - err = fmt.Errorf("fetching version: %s", err) - return - } - if dbver != DB_VERSION { - err = fmt.Errorf("version mismatch is %d, should be %d", dbver, DB_VERSION) - return - } - - if self.getPasswordStmt, err = self.dbh.Prepare("select PASSWORD from USERS where LOGIN_NAME = ?;"); err != nil { - return - } - if self.getGroupOfCartStmt, err = self.dbh.Prepare("select NAME,DEFAULT_LOW_CART,DEFAULT_HIGH_CART from GROUPS where DEFAULT_LOW_CART <= ? and DEFAULT_HIGH_CART >= ?;"); err != nil { - return - } - if self.getShowInfoStmt, err = self.dbh.Prepare("select CART.TITLE,CART.MACROS,DROPBOXES.GROUP_NAME,DROPBOXES.NORMALIZATION_LEVEL,DROPBOXES.AUTOTRIM_LEVEL,GROUPS.DEFAULT_LOW_CART,GROUPS.DEFAULT_HIGH_CART from CART, DROPBOXES, GROUPS where CART.NUMBER = DROPBOXES.TO_CART and GROUPS.NAME = DROPBOXES.GROUP_NAME and CART.NUMBER = ?;"); err != nil { - return - } - if self.checkMusicGroupStmt, err = self.dbh.Prepare("select count(*) from DROPBOXES where GROUP_NAME = ? and SET_USER_DEFINED like \"M;%\";"); err != nil { - return - } - if self.getMusicInfoStmt, err = self.dbh.Prepare("select NORMALIZATION_LEVEL,AUTOTRIM_LEVEL from DROPBOXES where DROPBOXES.GROUP_NAME = ?;"); err != nil { - return - } - return -} - -func (self *RdDb) getPassword(username string, cached bool) (result getPasswordResult) { - if cached { - result.password = self.passwordCache[username] - } - - if result.password == "" { - if result.err = self.getPasswordStmt.QueryRow(username).Scan(&result.password); result.err != nil { - if result.err == sql.ErrNoRows { - result.err = fmt.Errorf("user '%s' not known by rivendell", username) - } - return - } - self.passwordCache[username] = result.password - } - - return -} - -func (self *RdDb) getGroupOfCart(cart uint) (result getGroupOfCartResult) { - var rows *sql.Rows - if rows, result.err = self.getGroupOfCartStmt.Query(cart, cart); result.err != nil { - return - } - defer rows.Close() - sizeMin := ^uint(0) - for rows.Next() { - var name string - var lowCart, highCart uint - if result.err = rows.Scan(&name, &lowCart, &highCart); result.err != nil { - return - } - if highCart >= lowCart { - size := (highCart - lowCart) + 1 - if sizeMin > size { - result.group = name - sizeMin = size - } - } - } - if result.err = rows.Err(); result.err != nil { - return - } - if result.group == "" { - result.err = fmt.Errorf("cart is outside of all group cart ranges") - } - return -} - -func (self *RdDb) getLogTableName(log string) (logtable string, err error) { - logtable = strings.Replace(log, " ", "_", -1) + "_LOG" - if !mysqlTableNameRe.MatchString(logtable) { - return "", fmt.Errorf("the log table name contains illegal charecters: %s", logtable) - } - return -} - -func (self *RdDb) getShowCarts(log string, lowCart, highCart int) (carts []uint, err error) { - var logtable string - if logtable, err = self.getLogTableName(log); err != nil { - return - } - q := fmt.Sprintf("select CART_NUMBER from %s where CART_NUMBER >= %d and CART_NUMBER <= %d order by COUNT;", logtable, lowCart, highCart) - var rows *sql.Rows - if rows, err = self.dbh.Query(q); err != nil { - return - } - defer rows.Close() - for rows.Next() { - var cart uint - if err = rows.Scan(&cart); err != nil { - return - } - carts = append(carts, cart) - } - err = rows.Err() - return -} - -func (self *RdDb) getShowInfo(showid uint) (result getShowInfoResult) { - var macros string - var lowCart, highCart int - result.err = self.getShowInfoStmt.QueryRow(showid).Scan(&result.title, ¯os, &result.group, &result.normLvl, &result.trimLvl, &lowCart, &highCart) - if result.err != nil { - if result.err == sql.ErrNoRows { - result.err = fmt.Errorf("show '%d' not found", showid) - } - return - } - result.normLvl /= 100 - result.trimLvl /= 100 - result.carts, result.err = self.getShowCarts(showMacroRe.FindStringSubmatch(macros)[1], lowCart, highCart) - return -} - -func (self *RdDb) checkMusicGroup(group string) (result checkMusicGroupResult) { - var cnt int - if result.err = self.checkMusicGroupStmt.QueryRow(group).Scan(&cnt); result.err != nil { - if result.err == sql.ErrNoRows { - result.err = nil - result.ismusic = false - } - return - } - result.ismusic = cnt > 0 - return -} - -func (self *RdDb) getMusicInfo(group string) (result getMusicInfoResult) { - result.err = self.getMusicInfoStmt.QueryRow(group).Scan(&result.normLvl, &result.trimLvl) - if result.err != nil { - if result.err == sql.ErrNoRows { - result.err = fmt.Errorf("music pool '%s' not found", group) - } - return - } - return -} - -func (self *RdDb) dispatchRequests() { - defer func() { self.done <- true }() - for { - select { - case <-self.quit: - return - case req := <-self.getPasswordChan: - req.response <- self.getPassword(req.username, req.cached) - case req := <-self.getGroupOfCartChan: - req.response <- self.getGroupOfCart(req.cart) - case req := <-self.getShowInfoChan: - req.response <- self.getShowInfo(req.showid) - case req := <-self.checkMusicGroupChan: - req.response <- self.checkMusicGroup(req.group) - case req := <-self.getMusicInfoChan: - req.response <- self.getMusicInfo(req.group) - } - } -} - -// ********************************************************* -// Public Interface - -type RdDbChan struct { - getPasswordChan chan<- getPasswordRequest - getGroupOfCartChan chan<- getGroupOfCartRequest - getShowInfoChan chan<- getShowInfoRequest - checkMusicGroupChan chan<- checkMusicGroupRequest - getMusicInfoChan chan<- getMusicInfoRequest -} - -func (self *RdDbChan) GetPassword(username string, cached bool) (string, error) { - resCh := make(chan getPasswordResult) - req := getPasswordRequest{} - req.username = username - req.cached = cached - req.response = resCh - self.getPasswordChan <- req - - res := <-resCh - if res.err != nil { - return "", res.err - } - return res.password, nil -} - -func (self *RdDbChan) CheckPassword(username, password string) (bool, error) { - cached := true - - for { - resCh := make(chan getPasswordResult) - req := getPasswordRequest{} - req.username = username - req.cached = cached - req.response = resCh - self.getPasswordChan <- req - - res := <-resCh - if res.err != nil { - return false, res.err - } - if password == res.password { - return true, nil - } - if cached { - cached = false - } else { - break - } - } - return false, nil -} - -func (self *RdDbChan) GetGroupOfCart(cart uint) (string, error) { - resCh := make(chan getGroupOfCartResult) - req := getGroupOfCartRequest{} - req.cart = cart - req.response = resCh - self.getGroupOfCartChan <- req - - res := <-resCh - if res.err != nil { - return "", res.err - } - return res.group, nil -} - -func (self *RdDbChan) GetShowInfo(showid uint) (string, int, int, []uint, error) { - resCh := make(chan getShowInfoResult) - req := getShowInfoRequest{} - req.showid = showid - req.response = resCh - self.getShowInfoChan <- req - - res := <-resCh - if res.err != nil { - return "", 0, 0, nil, res.err - } - return res.group, res.normLvl, res.trimLvl, res.carts, nil -} - -func (self *RdDbChan) CheckMusicGroup(groupname string) (bool, error) { - resCh := make(chan checkMusicGroupResult) - req := checkMusicGroupRequest{} - req.group = groupname - req.response = resCh - self.checkMusicGroupChan <- req - - res := <-resCh - if res.err != nil { - return false, res.err - } - return res.ismusic, nil -} - -func (self *RdDbChan) GetMusicInfo(groupname string) (int, int, error) { - resCh := make(chan getMusicInfoResult) - req := getMusicInfoRequest{} - req.group = groupname - req.response = resCh - self.getMusicInfoChan <- req - - res := <-resCh - if res.err != nil { - return 0, 0, res.err - } - return res.normLvl, res.trimLvl, nil -} - -func (self *RdDb) GetInterface() *RdDbChan { - ch := &RdDbChan{} - ch.getPasswordChan = self.getPasswordChan - ch.getGroupOfCartChan = self.getGroupOfCartChan - ch.getShowInfoChan = self.getShowInfoChan - ch.checkMusicGroupChan = self.checkMusicGroupChan - ch.getMusicInfoChan = self.getMusicInfoChan - return ch -} - -func (self *RdDb) Cleanup() { - self.quit <- true - <-self.done - close(self.quit) - close(self.done) - close(self.getPasswordChan) - if self.dbh != nil { - self.dbh.Close() - } - if self.getPasswordStmt != nil { - self.getPasswordStmt.Close() - } - if self.getGroupOfCartStmt != nil { - self.getGroupOfCartStmt.Close() - } - if self.getShowInfoStmt != nil { - self.getShowInfoStmt.Close() - } - if self.checkMusicGroupStmt != nil { - self.checkMusicGroupStmt.Close() - } - if self.getMusicInfoStmt != nil { - self.getMusicInfoStmt.Close() - } -} - -func NewRdDb(conf *Config) (db *RdDb, err error) { - db = new(RdDb) - - db.quit = make(chan bool) - db.done = make(chan bool) - db.passwordCache = make(map[string]string) - db.getPasswordChan = make(chan getPasswordRequest, 10) - db.getGroupOfCartChan = make(chan getGroupOfCartRequest, 10) - db.getShowInfoChan = make(chan getShowInfoRequest, 10) - db.checkMusicGroupChan = make(chan checkMusicGroupRequest, 10) - db.getMusicInfoChan = make(chan getMusicInfoRequest, 10) - - if err = db.init(conf); err != nil { - return - } - - go db.dispatchRequests() - return -} diff --git a/session_store.go b/session_store.go index 8b48c0a..e47366e 100644 --- a/session_store.go +++ b/session_store.go @@ -28,6 +28,7 @@ import ( "crypto/rand" "encoding/base64" "fmt" + "helsinki.at/rhrd-go/rddb" "net/http" ) @@ -90,7 +91,7 @@ type SessionStoreElement struct { type SessionStore struct { store map[string]map[string]*SessionStoreElement conf *Config - rddb *RdDbChan + db *rddb.DBChan quit chan bool done chan bool newChan chan newSessionRequest @@ -111,7 +112,7 @@ func (self *SessionStore) new(ctx *Context, refId string) (resp newSessionRespon resp.responsecode = http.StatusOK resp.errorstring = "OK" if !ctx.Trusted { - if ok, err := self.rddb.CheckPassword(ctx.UserName, ctx.Password); err != nil { + if ok, err := self.db.CheckPassword(ctx.UserName, ctx.Password); err != nil { resp.responsecode = http.StatusInternalServerError resp.errorstring = err.Error() return @@ -130,7 +131,7 @@ func (self *SessionStore) new(ctx *Context, refId string) (resp newSessionRespon self.store[ctx.UserName] = make(map[string]*SessionStoreElement) } ctx.conf = self.conf - ctx.rddb = self.rddb + ctx.db = self.db s := &SessionStoreElement{newSession(ctx, func() { self.GetInterface().Remove(ctx.UserName, resp.id) }), refId} self.store[ctx.UserName][resp.id] = s resp.session = self.store[ctx.UserName][resp.id].s.getInterface() @@ -156,7 +157,7 @@ func (self *SessionStore) list(user, password string, trusted bool) (resp listSe resp.responsecode = http.StatusOK resp.errorstring = "OK" if !trusted { - if ok, err := self.rddb.CheckPassword(user, password); err != nil { + if ok, err := self.db.CheckPassword(user, password); err != nil { resp.responsecode = http.StatusInternalServerError resp.errorstring = err.Error() return @@ -292,10 +293,10 @@ func (self *SessionStore) Cleanup() { close(self.removeChan) } -func NewSessionStore(conf *Config, rddb *RdDbChan) (store *SessionStore, err error) { +func NewSessionStore(conf *Config, db *rddb.DBChan) (store *SessionStore, err error) { store = new(SessionStore) store.conf = conf - store.rddb = rddb + store.db = db store.quit = make(chan bool) store.done = make(chan bool) store.store = make(map[string]map[string]*SessionStoreElement) |