Skip to content

Commit 6ae441b

Browse files
chrmartichrmarti
authored
Kerberos auth for proxies (microsoft#188130)
1 parent d1177d5 commit 6ae441b

19 files changed

+192
-54
lines changed

‎.devcontainer/install-vscode.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.mi
99
rm -f packages.microsoft.gpg
1010

1111
apt update
12-
apt install -y code-insiders libsecret-1-dev libxkbfile-dev
12+
apt install -y code-insiders libsecret-1-dev libxkbfile-dev libkrb5-dev

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
- name: Setup Build Environment
108108
run: |
109109
sudo apt-get update
110-
sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
110+
sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libkrb5-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
111111
sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
112112
sudo chmod +x /etc/init.d/xvfb
113113
sudo update-rc.d xvfb defaults

‎.github/workflows/monaco-editor.yml

+3
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ jobs:
4545
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
4646
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
4747
restore-keys: ${{ runner.os }}-yarnCacheDir-
48+
- name: Install libkrb5-dev
49+
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
50+
run: sudo apt install -y libkrb5-dev
4851
- name: Execute yarn
4952
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
5053
env:

‎build/.moduleignore

+6
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ windows-foreground-love/build/**
7373
windows-foreground-love/src/**
7474
!windows-foreground-love/**/*.node
7575

76+
kerberos/binding.gyp
77+
kerberos/build/**
78+
kerberos/src/**
79+
kerberos/node_modules/**
80+
!kerberos/**/*.node
81+
7682
keytar/binding.gyp
7783
keytar/build/**
7884
keytar/src/**

‎build/azure-pipelines/alpine/product-build-alpine.yml

+5
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ steps:
6767
displayName: "Pull image"
6868
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
6969

70+
- script: |
71+
sudo apt-get update && sudo apt-get install -y libkrb5-dev
72+
displayName: Install libkrb5-dev
73+
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
74+
7075
- script: |
7176
set -e
7277
for i in {1..5}; do # try 5 times

‎build/azure-pipelines/linux/product-build-linux-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ steps:
1818
- script: |
1919
set -e
2020
sudo apt-get update
21-
sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
21+
sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libkrb5-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
2222
sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
2323
sudo chmod +x /etc/init.d/xvfb
2424
sudo update-rc.d xvfb defaults

‎build/azure-pipelines/linux/product-build-linux.yml

+5
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ steps:
110110
displayName: Register Docker QEMU
111111
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['VSCODE_ARCH'], 'arm64'))
112112

113+
- script: |
114+
sudo apt-get update && sudo apt-get install -y libkrb5-dev
115+
displayName: Install libkrb5-dev
116+
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
117+
113118
- script: |
114119
set -e
115120

‎build/azure-pipelines/product-compile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ steps:
4949
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
5050
displayName: Setup NPM Authentication
5151

52-
- script: sudo apt update -y && sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libsecret-1-dev libnotify-bin
52+
- script: sudo apt update -y && sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libsecret-1-dev libnotify-bin libkrb5-dev
5353
displayName: Install build tools
5454
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
5555

‎build/azure-pipelines/web/product-build-web.yml

+5
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ steps:
5353
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
5454
displayName: Setup NPM Authentication
5555

56+
- script: |
57+
sudo apt-get update && sudo apt-get install -y libkrb5-dev
58+
displayName: Install libkrb5-dev
59+
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
60+
5661
- script: |
5762
set -e
5863
for i in {1..5}; do # try 5 times

‎build/linux/debian/dep-lists.js

+7-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/linux/debian/dep-lists.ts

+6
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ export const referenceGeneratedDepsByArch = {
3838
'libgbm1 (>= 17.1.0~rc2)',
3939
'libglib2.0-0 (>= 2.16.0)',
4040
'libglib2.0-0 (>= 2.39.4)',
41+
'libgssapi-krb5-2 (>= 1.17)',
4142
'libgtk-3-0 (>= 3.9.10)',
4243
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
44+
'libkrb5-3 (>= 1.6.dfsg.2)',
4345
'libnspr4 (>= 2:4.9-2~)',
4446
'libnss3 (>= 2:3.22)',
4547
'libnss3 (>= 3.26)',
@@ -76,8 +78,10 @@ export const referenceGeneratedDepsByArch = {
7678
'libgbm1 (>= 17.1.0~rc2)',
7779
'libglib2.0-0 (>= 2.12.0)',
7880
'libglib2.0-0 (>= 2.39.4)',
81+
'libgssapi-krb5-2 (>= 1.17)',
7982
'libgtk-3-0 (>= 3.9.10)',
8083
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
84+
'libkrb5-3 (>= 1.6.dfsg.2)',
8185
'libnspr4 (>= 2:4.9-2~)',
8286
'libnss3 (>= 2:3.22)',
8387
'libnss3 (>= 3.26)',
@@ -113,8 +117,10 @@ export const referenceGeneratedDepsByArch = {
113117
'libgbm1 (>= 17.1.0~rc2)',
114118
'libglib2.0-0 (>= 2.12.0)',
115119
'libglib2.0-0 (>= 2.39.4)',
120+
'libgssapi-krb5-2 (>= 1.17)',
116121
'libgtk-3-0 (>= 3.9.10)',
117122
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
123+
'libkrb5-3 (>= 1.6.dfsg.2)',
118124
'libnspr4 (>= 2:4.9-2~)',
119125
'libnss3 (>= 2:3.22)',
120126
'libnss3 (>= 3.26)',

0 commit comments

Comments
 (0)