Fix Citadel security audit findings#137

HDauven wants to merge 3 commits into

maindusk-network/citadel:mainfrom

security/citadel-audit-fixesdusk-network/citadel:security/citadel-audit-fixesCopy head branch name to clipboard