Release 2024.8.0

.teamcity/package-windows.sh

@@ -3,17 +3,14 @@ echo $VERSION
 
 export TARGET_OS=windows
 # This controls the directory the built artifacts go into
-export BUILT_ARTIFACT_DIR=built_artifacts/
-export FINAL_ARTIFACT_DIR=artifacts/
-mkdir -p $BUILT_ARTIFACT_DIR
-mkdir -p $FINAL_ARTIFACT_DIR
+export ARTIFACT_DIR=built_artifacts/
+mkdir -p $ARTIFACT_DIR
 windowsArchs=("amd64" "386")
 for arch in ${windowsArchs[@]}; do
     export TARGET_ARCH=$arch
     # Copy exe into final directory
-    cp $BUILT_ARTIFACT_DIR/cloudflared-windows-$arch.exe ./cloudflared.exe
+    cp $ARTIFACT_DIR/cloudflared-windows-$arch.exe ./cloudflared.exe
     make cloudflared-msi
     # Copy msi into final directory
-    mv cloudflared-$VERSION-$arch.msi $FINAL_ARTIFACT_DIR/cloudflared-windows-$arch.msi
-    cp $BUILT_ARTIFACT_DIR/cloudflared-windows-$arch.exe $FINAL_ARTIFACT_DIR/cloudflared-windows-$arch.exe 
+    mv cloudflared-$VERSION-$arch.msi $ARTIFACT_DIR/cloudflared-windows-$arch.msi
 done

Makefile

@@ -218,10 +218,6 @@ cloudflared-pkg: cloudflared cloudflared.1
 cloudflared-msi:
 	wixl --define Version=$(VERSION) --define Path=$(EXECUTABLE_PATH) --output cloudflared-$(VERSION)-$(TARGET_ARCH).msi cloudflared.wxs
 
-.PHONY: github-release-dryrun
-github-release-dryrun:
-	python3 github_release.py --path $(PWD)/built_artifacts --release-version $(VERSION) --dry-run
-
 .PHONY: github-release
 github-release:
 	python3 github_release.py --path $(PWD)/built_artifacts --release-version $(VERSION)

RELEASE_NOTES

@@ -1,21 +1,5 @@
-2024.9.1
-- 2024-09-10 Revert Release 2024.9.0
-
-2024.9.0
-- 2024-09-10 TUN-8621: Fix cloudflared version in change notes.
-- 2024-09-06 PPIP-2310: Update quick tunnel disclaimer
-- 2024-08-30 TUN-8621: Prevent QUIC connection from closing before grace period after unregistering
-- 2024-08-09 TUN-8592: Use metadata from the edge to determine if request body is empty for QUIC transport
-- 2024-06-26 TUN-8484: Print response when QuickTunnel can't be unmarshalled
-
-2024.8.3
-- 2024-08-15 TUN-8591 login command without extra text
-- 2024-03-25 remove code that will not be executed
-- 2024-03-25 remove code that will not be executed
-
-2024.8.2
-- 2024-08-05 TUN-8583: change final directory of artifacts
-- 2024-08-05 TUN-8585: Avoid creating GH client when dry-run is true
+2024.8.0
+- 2024-08-01 TUN-8546: remove call to non existant make target
 
 2024.7.3
 - 2024-07-31 TUN-8546: Fix final artifacts paths

build-packages-fips.sh

@@ -3,7 +3,7 @@ VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
 echo $VERSION
 
 # This controls the directory the built artifacts go into
-export ARTIFACT_DIR=artifacts/
+export ARTIFACT_DIR=built_artifacts/
 mkdir -p $ARTIFACT_DIR
 
 arch=("amd64")
@@ -23,4 +23,4 @@ make cloudflared-rpm
 mv cloudflared-fips-$RPMVERSION-1.$RPMARCH.rpm $ARTIFACT_DIR/cloudflared-fips-linux-$RPMARCH.rpm
 
 # finally move the linux binary as well.
-mv ./cloudflared $ARTIFACT_DIR/cloudflared-fips-linux-$arch
+mv ./cloudflared $ARTIFACT_DIR/cloudflared-fips-linux-$arch

build-packages.sh

@@ -7,7 +7,7 @@ export GOEXPERIMENT=noboringcrypto
 export CGO_ENABLED=0
 
 # This controls the directory the built artifacts go into
-export ARTIFACT_DIR=artifacts/
+export ARTIFACT_DIR=built_artifacts/
 mkdir -p $ARTIFACT_DIR
 
 linuxArchs=("386" "amd64" "arm" "armhf" "arm64")

cfsetup.yaml

@@ -195,23 +195,9 @@ buster: &buster
       - component-tests/requirements.txt
     pre-cache: *component_test_pre_cache
     post-cache: *component_test_post_cache
-  github-release-dryrun:
-    build_dir: *build_dir
-    builddeps:
-      - *pinned_go
-      - build-essential
-      - python3-dev
-      - libffi-dev
-      - python3-setuptools
-      - python3-pip
-    pre-cache:
-      - pip3 install pynacl==1.4.0
-      - pip3 install pygithub==1.55
-    post-cache:
-      - make github-release-dryrun
   github-release:
     build_dir: *build_dir
-    builddeps:
+    builddeps: 
       - *pinned_go
       - build-essential
       - python3-dev

cmd/cloudflared/access/cmd.go

@@ -26,7 +26,6 @@ import (
 )
 
 const (
-	appURLFlag         = "app"
 	loginQuietFlag     = "quiet"
 	sshHostnameFlag    = "hostname"
 	sshDestinationFlag = "destination"
@@ -84,10 +83,9 @@ func Commands() []*cli.Command {
 			applications from the command line.`,
 			Subcommands: []*cli.Command{
 				{
-					Name:      "login",
-					Action:    cliutil.Action(login),
-					Usage:     "login <url of access application>",
-					ArgsUsage: "url of Access application",
+					Name:   "login",
+					Action: cliutil.Action(login),
+					Usage:  "login <url of access application>",
 					Description: `The login subcommand initiates an authentication flow with your identity provider.
 					The subcommand will launch a browser. For headless systems, a url is provided.
 					Once authenticated with your identity provider, the login command will generate a JSON Web Token (JWT)
@@ -99,13 +97,6 @@ func Commands() []*cli.Command {
 							Aliases: []string{"q"},
 							Usage:   "do not print the jwt to the command line",
 						},
-						&cli.BoolFlag{
-							Name:  "no-verbose",
-							Usage: "print only the jwt to stdout",
-						},
-						&cli.StringFlag{
-							Name: appURLFlag,
-						},
 					},
 				},
 				{
@@ -120,12 +111,12 @@ func Commands() []*cli.Command {
 				{
 					Name:        "token",
 					Action:      cliutil.Action(generateToken),
-					Usage:       "token <url of access application>",
+					Usage:       "token -app=<url of access application>",
 					ArgsUsage:   "url of Access application",
 					Description: `The token subcommand produces a JWT which can be used to authenticate requests.`,
 					Flags: []cli.Flag{
 						&cli.StringFlag{
-							Name: appURLFlag,
+							Name: "app",
 						},
 					},
 				},
@@ -241,8 +232,9 @@ func login(c *cli.Context) error {
 
 	log := logger.CreateLoggerFromContext(c, logger.EnableTerminalLog)
 
-	appURL, err := getAppURLFromArgs(c)
-	if err != nil {
+	args := c.Args()
+	appURL, err := parseURL(args.First())
+	if args.Len() < 1 || err != nil {
 		log.Error().Msg("Please provide the url of the Access application")
 		return err
 	}
@@ -269,14 +261,7 @@ func login(c *cli.Context) error {
 	if c.Bool(loginQuietFlag) {
 		return nil
 	}
-
-	// Chatty by default for backward compat. The new --app flag
-	// is an implicit opt-out of the backwards-compatible chatty output.
-	if c.Bool("no-verbose") || c.IsSet(appURLFlag) {
-		fmt.Fprint(os.Stdout, cfdToken)
-	} else {
-		fmt.Fprintf(os.Stdout, "Successfully fetched your token:\n\n%s\n\n", cfdToken)
-	}
+	fmt.Fprintf(os.Stdout, "Successfully fetched your token:\n\n%s\n\n", cfdToken)
 
 	return nil
 }
@@ -355,17 +340,6 @@ func run(cmd string, args ...string) error {
 	return c.Run()
 }
 
-func getAppURLFromArgs(c *cli.Context) (*url.URL, error) {
-	var appURLStr string
-	args := c.Args()
-	if args.Len() < 1 {
-		appURLStr = c.String(appURLFlag)
-	} else {
-		appURLStr = args.First()
-	}
-	return parseURL(appURLStr)
-}
-
 // token dumps provided token to stdout
 func generateToken(c *cli.Context) error {
 	err := sentry.Init(sentry.ClientOptions{
@@ -375,8 +349,8 @@ func generateToken(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	appURL, err := getAppURLFromArgs(c)
-	if err != nil {
+	appURL, err := parseURL(c.String("app"))
+	if err != nil || c.NumFlags() < 1 {
 		fmt.Fprintln(os.Stderr, "Please provide a url.")
 		return err
 	}

github_release.py

@@ -17,7 +17,7 @@ import re
 from github import Github, GithubException, UnknownObjectException
 
 FORMAT = "%(levelname)s - %(asctime)s: %(message)s"
-logging.basicConfig(format=FORMAT, level=logging.INFO)
+logging.basicConfig(format=FORMAT)
 
 CLOUDFLARED_REPO = os.environ.get("GITHUB_REPO", "cloudflare/cloudflared")
 GITHUB_CONFLICT_CODE = "already_exists"
@@ -214,33 +214,24 @@ def main():
     """ Attempts to upload Asset to Github Release. Creates Release if it doesn't exist """
     try:
         args = parse_args()
+        client = Github(args.api_key)
+        repo = client.get_repo(CLOUDFLARED_REPO)
+        release = get_or_create_release(repo, args.release_version, args.dry_run)
 
         if args.dry_run:
-            if os.path.isdir(args.path):
-                onlyfiles = [f for f in listdir(args.path) if isfile(join(args.path, f))]
-                for filename in onlyfiles:
-                    binary_path = os.path.join(args.path, filename)
-                    logging.info("binary: " + binary_path)
-            elif os.path.isfile(args.path):
-                logging.info("binary: " + binary_path)
-            else:
-                logging.error("dryrun failed")
+            logging.info("Skipping asset upload because of dry-run")
             return
-        else:
-            client = Github(args.api_key)
-            repo = client.get_repo(CLOUDFLARED_REPO)
-            release = get_or_create_release(repo, args.release_version, args.dry_run)
 
-            if os.path.isdir(args.path):
-                onlyfiles = [f for f in listdir(args.path) if isfile(join(args.path, f))]
-                for filename in onlyfiles:
-                    binary_path = os.path.join(args.path, filename)
-                    upload_asset(release, binary_path, filename, args.release_version, args.kv_account_id, args.namespace_id,
-                    args.kv_api_token)
-                    move_asset(binary_path, filename)
-            else:
-                upload_asset(release, args.path, args.name, args.release_version, args.kv_account_id, args.namespace_id,
-                    args.kv_api_token)
+        if os.path.isdir(args.path):
+            onlyfiles = [f for f in listdir(args.path) if isfile(join(args.path, f))]
+            for filename in onlyfiles:
+                binary_path = os.path.join(args.path, filename)
+                upload_asset(release, binary_path, filename, args.release_version, args.kv_account_id, args.namespace_id,
+                args.kv_api_token)
+                move_asset(binary_path, filename)
+        else:
+            upload_asset(release, args.path, args.name, args.release_version, args.kv_account_id, args.namespace_id,
+                args.kv_api_token)
 
     except Exception as e:
         logging.exception(e)

management/middleware_test.go

@@ -52,11 +52,13 @@ func testRequest(t *testing.T, ts *httptest.Server, method, path string, body io
 	req, err := http.NewRequest(method, ts.URL+path, body)
 	if err != nil {
 		t.Fatal(err)
+		return nil, nil
 	}
 
 	resp, err := ts.Client().Do(req)
 	if err != nil {
 		t.Fatal(err)
+		return nil, nil
 	}
 	var claims managementErrorResponse
 	err = json.NewDecoder(resp.Body).Decode(&claims)