Use goji.io mux

Remove old router implementation.
This commit is contained in:
Zlatko Čalušić 2016-12-27 13:42:43 +01:00
parent 1f29574118
commit fa0b53efe7
4 changed files with 222 additions and 449 deletions

View file

@ -13,16 +13,11 @@ import (
"time"
)
// Context contains repository metadata.
type Context struct {
path string
}
func isHashed(dir string) bool {
return dir == "data"
}
func createDirectories(c *Context) {
func createDirectories(path string) {
log.Println("Creating repository directories")
dirs := []string{
@ -35,13 +30,13 @@ func createDirectories(c *Context) {
}
for _, d := range dirs {
if err := os.MkdirAll(filepath.Join(c.path, d), 0700); err != nil {
if err := os.MkdirAll(filepath.Join(path, d), 0700); err != nil {
log.Fatal(err)
}
}
for i := 0; i < 256; i++ {
if err := os.MkdirAll(filepath.Join(c.path, "data", fmt.Sprintf("%02x", i)), 0700); err != nil {
if err := os.MkdirAll(filepath.Join(path, "data", fmt.Sprintf("%02x", i)), 0700); err != nil {
log.Fatal(err)
}
}
@ -60,233 +55,217 @@ func AuthHandler(f *HtpasswdFile, h http.Handler) http.HandlerFunc {
}
}
// CheckConfig returns a http.HandlerFunc that checks whether a configuration exists.
func CheckConfig(c *Context) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("CheckConfig()")
}
config := filepath.Join(c.path, "config")
st, err := os.Stat(config)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
w.Header().Add("Content-Length", fmt.Sprint(st.Size()))
// CheckConfig checks whether a configuration exists.
func CheckConfig(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("CheckConfig()")
}
config := filepath.Join(*path, "config")
st, err := os.Stat(config)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
w.Header().Add("Content-Length", fmt.Sprint(st.Size()))
}
// GetConfig returns a http.HandlerFunc that allows for a config to be retrieved.
func GetConfig(c *Context) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("GetConfig()")
}
config := filepath.Join(c.path, "config")
bytes, err := ioutil.ReadFile(config)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
w.Write(bytes)
// GetConfig allows for a config to be retrieved.
func GetConfig(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("GetConfig()")
}
config := filepath.Join(*path, "config")
bytes, err := ioutil.ReadFile(config)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
w.Write(bytes)
}
// SaveConfig returns a http.HandlerFunc that allows for a config to be saved.
func SaveConfig(c *Context) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("SaveConfig()")
}
config := filepath.Join(c.path, "config")
bytes, err := ioutil.ReadAll(r.Body)
if err != nil {
http.Error(w, "400 bad request", 400)
return
}
if err := ioutil.WriteFile(config, bytes, 0600); err != nil {
http.Error(w, "500 internal server error", 500)
return
}
w.Write([]byte("200 ok"))
// SaveConfig allows for a config to be saved.
func SaveConfig(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("SaveConfig()")
}
config := filepath.Join(*path, "config")
bytes, err := ioutil.ReadAll(r.Body)
if err != nil {
http.Error(w, "400 bad request", 400)
return
}
if err := ioutil.WriteFile(config, bytes, 0600); err != nil {
http.Error(w, "500 internal server error", 500)
return
}
w.Write([]byte("200 ok"))
}
// ListBlobs returns a http.HandlerFunc that lists all blobs of a given type in an arbitrary order.
func ListBlobs(c *Context) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("ListBlobs()")
}
vars := strings.Split(r.RequestURI, "/")
dir := vars[1]
path := filepath.Join(c.path, dir)
// ListBlobs lists all blobs of a given type in an arbitrary order.
func ListBlobs(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("ListBlobs()")
}
vars := strings.Split(r.RequestURI, "/")
dir := vars[1]
path := filepath.Join(*path, dir)
items, err := ioutil.ReadDir(path)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
items, err := ioutil.ReadDir(path)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
var names []string
for _, i := range items {
if isHashed(dir) {
subpath := filepath.Join(path, i.Name())
subitems, err := ioutil.ReadDir(subpath)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
for _, f := range subitems {
names = append(names, f.Name())
}
} else {
names = append(names, i.Name())
var names []string
for _, i := range items {
if isHashed(dir) {
subpath := filepath.Join(path, i.Name())
subitems, err := ioutil.ReadDir(subpath)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
}
data, err := json.Marshal(names)
if err != nil {
http.Error(w, "500 internal server error", 500)
return
}
w.Write(data)
}
}
// CheckBlob returns a http.HandlerFunc that tests whether a blob exists and returns 200, if it does, or 404 otherwise.
func CheckBlob(c *Context) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("CheckBlob()")
}
vars := strings.Split(r.RequestURI, "/")
dir := vars[1]
name := vars[2]
if isHashed(dir) {
name = filepath.Join(name[:2], name)
}
path := filepath.Join(c.path, dir, name)
st, err := os.Stat(path)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
w.Header().Add("Content-Length", fmt.Sprint(st.Size()))
}
}
// GetBlob returns a http.HandlerFunc that retrieves a blob from the repository.
func GetBlob(c *Context) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("GetBlob()")
}
vars := strings.Split(r.RequestURI, "/")
dir := vars[1]
name := vars[2]
if isHashed(dir) {
name = filepath.Join(name[:2], name)
}
path := filepath.Join(c.path, dir, name)
file, err := os.Open(path)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
http.ServeContent(w, r, "", time.Unix(0, 0), file)
file.Close()
}
}
// SaveBlob returns a http.HandlerFunc that saves a blob to the repository.
func SaveBlob(c *Context) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("SaveBlob()")
}
vars := strings.Split(r.RequestURI, "/")
dir := vars[1]
name := vars[2]
if dir == "keys" {
if _, err := os.Stat("keys"); err != nil && os.IsNotExist(err) {
createDirectories(c)
for _, f := range subitems {
names = append(names, f.Name())
}
} else {
names = append(names, i.Name())
}
tmp := filepath.Join(c.path, "tmp", name)
tf, err := os.OpenFile(tmp, os.O_CREATE|os.O_WRONLY, 0600)
if err != nil {
http.Error(w, "500 internal server error", 500)
return
}
if _, err := io.Copy(tf, r.Body); err != nil {
tf.Close()
os.Remove(tmp)
http.Error(w, "400 bad request", 400)
return
}
if err := tf.Sync(); err != nil {
tf.Close()
os.Remove(tmp)
http.Error(w, "500 internal server error", 500)
return
}
if err := tf.Close(); err != nil {
os.Remove(tmp)
http.Error(w, "500 internal server error", 500)
return
}
if isHashed(dir) {
name = filepath.Join(name[:2], name)
}
path := filepath.Join(c.path, dir, name)
if err := os.Rename(tmp, path); err != nil {
os.Remove(tmp)
os.Remove(path)
http.Error(w, "500 internal server error", 500)
return
}
w.Write([]byte("200 ok"))
}
data, err := json.Marshal(names)
if err != nil {
http.Error(w, "500 internal server error", 500)
return
}
w.Write(data)
}
// DeleteBlob returns a http.HandlerFunc that deletes a blob from the repository.
func DeleteBlob(c *Context) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("DeleteBlob()")
}
vars := strings.Split(r.RequestURI, "/")
dir := vars[1]
name := vars[2]
if isHashed(dir) {
name = filepath.Join(name[:2], name)
}
path := filepath.Join(c.path, dir, name)
if err := os.Remove(path); err != nil {
http.Error(w, "500 internal server error", 500)
return
}
w.Write([]byte("200 ok"))
// CheckBlob tests whether a blob exists and returns 200, if it does, or 404 otherwise.
func CheckBlob(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("CheckBlob()")
}
vars := strings.Split(r.RequestURI, "/")
dir := vars[1]
name := vars[2]
if isHashed(dir) {
name = filepath.Join(name[:2], name)
}
path := filepath.Join(*path, dir, name)
st, err := os.Stat(path)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
w.Header().Add("Content-Length", fmt.Sprint(st.Size()))
}
// GetBlob retrieves a blob from the repository.
func GetBlob(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("GetBlob()")
}
vars := strings.Split(r.RequestURI, "/")
dir := vars[1]
name := vars[2]
if isHashed(dir) {
name = filepath.Join(name[:2], name)
}
path := filepath.Join(*path, dir, name)
file, err := os.Open(path)
if err != nil {
http.Error(w, "404 not found", 404)
return
}
http.ServeContent(w, r, "", time.Unix(0, 0), file)
file.Close()
}
// SaveBlob saves a blob to the repository.
func SaveBlob(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("SaveBlob()")
}
vars := strings.Split(r.RequestURI, "/")
dir := vars[1]
name := vars[2]
if dir == "keys" {
if _, err := os.Stat("keys"); err != nil && os.IsNotExist(err) {
createDirectories(*path)
}
}
tmp := filepath.Join(*path, "tmp", name)
tf, err := os.OpenFile(tmp, os.O_CREATE|os.O_WRONLY, 0600)
if err != nil {
http.Error(w, "500 internal server error", 500)
return
}
if _, err := io.Copy(tf, r.Body); err != nil {
tf.Close()
os.Remove(tmp)
http.Error(w, "400 bad request", 400)
return
}
if err := tf.Sync(); err != nil {
tf.Close()
os.Remove(tmp)
http.Error(w, "500 internal server error", 500)
return
}
if err := tf.Close(); err != nil {
os.Remove(tmp)
http.Error(w, "500 internal server error", 500)
return
}
if isHashed(dir) {
name = filepath.Join(name[:2], name)
}
path := filepath.Join(*path, dir, name)
if err := os.Rename(tmp, path); err != nil {
os.Remove(tmp)
os.Remove(path)
http.Error(w, "500 internal server error", 500)
return
}
w.Write([]byte("200 ok"))
}
// DeleteBlob deletes a blob from the repository.
func DeleteBlob(w http.ResponseWriter, r *http.Request) {
if *debug {
log.Println("DeleteBlob()")
}
vars := strings.Split(r.RequestURI, "/")
dir := vars[1]
name := vars[2]
if isHashed(dir) {
name = filepath.Join(name[:2], name)
}
path := filepath.Join(*path, dir, name)
if err := os.Remove(path); err != nil {
http.Error(w, "500 internal server error", 500)
return
}
w.Write([]byte("200 ok"))
}