chore: version v2.0.11

Check if keys exist in map. Fixes: #736

.circleci/config.yml

@@ -40,25 +40,6 @@ jobs:
           command: |
             rm -rf frontend/build
             git checkout -- go.sum # TODO: why is it being changed?
-      - persist_to_workspace:
-          root: .
-          paths:
-            - '*'
-  docker-latest:
-    docker:
-      - image: docker
-    steps:
-      - attach_workspace:
-          at: '~/project'
-      - setup_remote_docker
-      - run: docker build -t filebrowser/filebrowser .
-      - run: docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-      - run: docker push filebrowser/filebrowser
-      - run: docker logout
-      - persist_to_workspace:
-          root: .
-          paths:
-            - '*'
   release:
     docker:
       - image: circleci/golang:1.12
@@ -96,13 +77,4 @@ workflows:
             tags:
               only: /^v.*/
             branches:
-              ignore: /.*/
-      - docker-latest:
-          context: deploy
-          requires:
-            - build-go
-          filters:
-            branches:
-              only: master
-            tags:
-              ignore: /.*/
+              ignore: /.*/

cmd/config.go

@@ -89,25 +89,24 @@ func getAuthentication(flags *pflag.FlagSet, defaults ...interface{}) (settings.
 		secret := mustGetString(flags, "recaptcha.secret")
 
 		if key == "" {
-			kmap := defaultAuther["recaptcha"].(map[string]interface{})
-			key = kmap["key"].(string)
+			if kmap, ok := defaultAuther["recaptcha"].(map[string]interface{}); ok {
+				key = kmap["key"].(string)
+			}
 		}
 
 		if secret == "" {
-			smap := defaultAuther["recaptcha"].(map[string]interface{})
-			secret = smap["secret"].(string)
+			if smap, ok := defaultAuther["recaptcha"].(map[string]interface{}); ok {
+				secret = smap["secret"].(string)
+			}
 		}
 
-		if key == "" || secret == "" {
-			checkErr(nerrors.New("you must set the flag 'recaptcha.key' and 'recaptcha.secret' for method 'json'"))
+		if key != "" && secret != "" {
+			jsonAuth.ReCaptcha = &auth.ReCaptcha{
+				Host:   host,
+				Key:    key,
+				Secret: secret,
+			}
 		}
-
-		jsonAuth.ReCaptcha = &auth.ReCaptcha{
-			Host:   host,
-			Key:    key,
-			Secret: secret,
-		}
-
 		auther = jsonAuth
 	}
 

cmd/root.go

@@ -194,7 +194,7 @@ func getRunParams(flags *pflag.FlagSet, st *storage.Storage) *settings.Server {
 	}
 
 	if isAddrSet && isSocketSet {
-		checkErr(errors.New("--socket flag cannot be used with --adress, --port, --key nor --cert"))
+		checkErr(errors.New("--socket flag cannot be used with --address, --port, --key nor --cert"))
 	}
 
 	// Do not use saved Socket if address was manually set.