From 6300fdf85e5d25ecd3f1735cee60e603666ade66 Mon Sep 17 00:00:00 2001
From: Sauyon Lee <sauyon@github.com>
Date: Wed, 5 Feb 2020 14:25:27 -0800
Subject: [PATCH] Remove accidentally added CleartextStorage tests

---
 .../Security/CWE-312/CleartextStorage.go      | 21 -------
 .../Security/CWE-312/CleartextStorageGood.go  | 62 -------------------
 2 files changed, 83 deletions(-)
 delete mode 100644 ql/test/query-tests/Security/CWE-312/CleartextStorage.go
 delete mode 100644 ql/test/query-tests/Security/CWE-312/CleartextStorageGood.go

diff --git a/ql/test/query-tests/Security/CWE-312/CleartextStorage.go b/ql/test/query-tests/Security/CWE-312/CleartextStorage.go
deleted file mode 100644
index df59e07a9cd..00000000000
--- a/ql/test/query-tests/Security/CWE-312/CleartextStorage.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package main
-
-import (
-	"net/http"
-)
-
-func serve2() {
-	http.HandleFunc("/register", func(w http.ResponseWriter, r *http.Request) {
-		r.ParseForm()
-		user := r.Form.Get("user")
-		pw := r.Form.Get("password")
-
-		userdb.Store(user, pw)
-
-		var pwCookie http.Cookie
-		pwCookie.Name = "password"
-		pwCookie.Value = pw
-		http.SetCookie(w, &pwCookie)
-	})
-	http.ListenAndServe(":80", nil)
-}
diff --git a/ql/test/query-tests/Security/CWE-312/CleartextStorageGood.go b/ql/test/query-tests/Security/CWE-312/CleartextStorageGood.go
deleted file mode 100644
index 5fc7a4789c8..00000000000
--- a/ql/test/query-tests/Security/CWE-312/CleartextStorageGood.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// +build ignore
-
-package main
-
-import (
-	"crypto/rand"
-	"encoding/base64"
-	"fmt"
-	"log"
-	"net/http"
-
-	"golang.org/x/crypto/scrypt"
-)
-
-var tokens = make(map[string]string)
-
-func saltAndHash(pw string) ([]byte, []byte) {
-	salt := make([]byte, 64)
-	_, err := io.ReadFull(rand.Reader, salt)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	hash, err := scrypt.Key([]byte(password), salt, 32768, 8, 1, 64)
-
-	return hash, salt
-}
-
-func genToken(user string) {
-	res := make([]byte, 32)
-	_, err := io.ReadFull(rand.Reader, salt)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	base64, err := base64.EncodeToString(res)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return base64
-}
-
-func serve1() {
-	http.HandleFunc("/register", func(w http.ResponseWriter, r *http.Request) {
-		r.ParseForm()
-		user := r.Form.Get("user")
-		pw := r.Form.Get("password")
-
-		log.Printf("Registering new user %s.\n", user)
-
-		hash, salt = saltAndHash(pw)
-
-		userdb.Store(user, hash, salt)
-
-		var tokenCookie Cookie
-		tokenCookie.Name = "auth"
-		tokenCookie.Value = genToken(user)
-		http.SetCookie(w, encrypt(pwCookie))
-	})
-	http.ListenAndServe(":80", nil)
-}