Minor.

vladaionescu · May 3, 2016 · 583b30c · 583b30c
1 parent ad6af05
commit 583b30c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/js/leveros/lib/leveros.js b/js/leveros/lib/leveros.js
@@ -2,8 +2,7 @@
 import 'source-map-support/register';
 
 import * as client from './client';
-import * as common from 'leveros-common';
 import lodash from 'lodash';
 
-const exported = lodash.extend({}, common, client);
+const exported = lodash.extend({}, client);
 module.exports = exported;
diff --git a/store/servicetable.go b/store/servicetable.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/url"
 	"strconv"
+	"strings"
 
 	aerospike "github.com/aerospike/aerospike-client-go"
 	"github.com/leveros/leveros/leverutil"
@@ -170,7 +171,10 @@ func serviceNameOk(service string) error {
 	if len(service) < 3 {
 		return fmt.Errorf("Service name too short")
 	}
-	if service != url.QueryEscape(service) {
+	if len(service) > 255 {
+		return fmt.Errorf("Service name too long")
+	}
+	if service != url.QueryEscape(service) || strings.Contains(service, "/") {
 		return fmt.Errorf("Service name not allowed")
 	}
 	return nil