Skip to content

Commit 6181a8f

Browse files
RenderMichaelRenderMichael
committed
Merge branch 'virtual-auth' of https://github.com/RenderMichael/selenium into virtual-auth
2 parents 8d3cc82 + 19d5aac commit 6181a8f

File tree

11 files changed

+157
-180
lines changed

11 files changed

+157
-180
lines changed

‎MODULE.bazel‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
1919

2020
bazel_dep(name = "rules_dotnet", version = "0.16.1")
2121
bazel_dep(name = "rules_java", version = "7.11.1")
22-
bazel_dep(name = "rules_jvm_external", version = "6.3")
22+
bazel_dep(name = "rules_jvm_external", version = "6.6")
2323
bazel_dep(name = "rules_nodejs", version = "6.3.0")
2424
bazel_dep(name = "rules_oci", version = "1.7.6")
2525
bazel_dep(name = "rules_pkg", version = "0.10.1")
@@ -182,23 +182,23 @@ maven.install(
182182
"dev.failsafe:failsafe:3.3.2",
183183
"io.grpc:grpc-context:1.68.1",
184184
"io.lettuce:lettuce-core:6.5.0.RELEASE",
185-
"io.netty:netty-buffer:4.1.115.Final",
186-
"io.netty:netty-codec-http:4.1.115.Final",
187-
"io.netty:netty-codec-http2:4.1.115.Final",
188-
"io.netty:netty-common:4.1.115.Final",
189-
"io.netty:netty-handler:4.1.115.Final",
190-
"io.netty:netty-handler-proxy:4.1.115.Final",
191-
"io.netty:netty-transport:4.1.115.Final",
192-
"io.opentelemetry:opentelemetry-api:1.44.1",
193-
"io.opentelemetry:opentelemetry-context:1.44.1",
194-
"io.opentelemetry:opentelemetry-exporter-logging:1.44.1",
195-
"io.opentelemetry:opentelemetry-sdk:1.44.1",
196-
"io.opentelemetry:opentelemetry-sdk-common:1.44.1",
197-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.44.1",
198-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.44.1",
199-
"io.opentelemetry:opentelemetry-sdk-testing:1.44.1",
200-
"io.opentelemetry:opentelemetry-sdk-trace:1.44.1",
201-
"io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha",
185+
"io.netty:netty-buffer",
186+
"io.netty:netty-codec-http",
187+
"io.netty:netty-codec-http2",
188+
"io.netty:netty-common",
189+
"io.netty:netty-handler",
190+
"io.netty:netty-handler-proxy",
191+
"io.netty:netty-transport",
192+
"io.opentelemetry:opentelemetry-api",
193+
"io.opentelemetry:opentelemetry-context",
194+
"io.opentelemetry:opentelemetry-exporter-logging",
195+
"io.opentelemetry:opentelemetry-sdk",
196+
"io.opentelemetry:opentelemetry-sdk-common",
197+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure",
198+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
199+
"io.opentelemetry:opentelemetry-sdk-testing",
200+
"io.opentelemetry:opentelemetry-sdk-trace",
201+
"io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
202202
"it.ozimov:embedded-redis:0.7.3",
203203
"net.bytebuddy:byte-buddy:1.15.10",
204204
"org.htmlunit:htmlunit-core-js:4.6.0",
@@ -209,20 +209,25 @@ maven.install(
209209
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
210210
"org.hsqldb:hsqldb:2.7.4",
211211
"org.jspecify:jspecify:1.0.0",
212-
"org.junit.jupiter:junit-jupiter-api:5.11.3",
213-
"org.junit.jupiter:junit-jupiter-engine:5.11.3",
214-
"org.junit.jupiter:junit-jupiter-params:5.11.3",
215-
"org.junit.platform:junit-platform-launcher:1.11.3",
216-
"org.junit.platform:junit-platform-reporting:1.11.3",
217-
"org.junit.platform:junit-platform-commons:1.11.3",
218-
"org.junit.platform:junit-platform-engine:1.11.3",
212+
"org.junit.jupiter:junit-jupiter-api",
213+
"org.junit.jupiter:junit-jupiter-engine",
214+
"org.junit.jupiter:junit-jupiter-params",
215+
"org.junit.platform:junit-platform-launcher",
216+
"org.junit.platform:junit-platform-reporting",
217+
"org.junit.platform:junit-platform-commons",
218+
"org.junit.platform:junit-platform-engine",
219219
"org.mockito:mockito-core:5.14.2",
220220
"org.redisson:redisson:3.39.0",
221221
"org.slf4j:slf4j-api:2.0.16",
222222
"org.slf4j:slf4j-jdk14:2.0.16",
223223
"org.tomlj:tomlj:1.1.1",
224224
"org.zeromq:jeromq:0.6.0",
225225
],
226+
boms = [
227+
"io.opentelemetry:opentelemetry-bom:1.44.1",
228+
"io.netty:netty-bom:4.1.115.Final",
229+
"org.junit:junit-bom:5.11.3",
230+
],
226231
excluded_artifacts = [
227232
"org.hamcrest:hamcrest-all", # Replaced by hamcrest 2
228233
"org.hamcrest:hamcrest-core",
@@ -235,6 +240,7 @@ maven.install(
235240
repositories = [
236241
"https://repo1.maven.org/maven2",
237242
],
243+
resolver = "maven",
238244
strict_visibility = True,
239245
)
240246
use_repo(maven, "maven", "unpinned_maven")

‎dotnet/src/webdriver/Chromium/ChromiumDriverService.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ protected static string ChromiumDriverServiceFileName(string fileName = DefaultC
208208
// straightforward as you might hope.
209209
// See: http://mono.wikia.com/wiki/Detecting_the_execution_platform
210210
// and https://msdn.microsoft.com/en-us/library/3a8hyw88(v=vs.110).aspx
211-
const int PlatformMonoUnixValue = 128;
211+
const PlatformID PlatformIDMonoUnix = (PlatformID)128;
212212

213213
switch (Environment.OSVersion.Platform)
214214
{
@@ -221,17 +221,14 @@ protected static string ChromiumDriverServiceFileName(string fileName = DefaultC
221221

222222
case PlatformID.MacOSX:
223223
case PlatformID.Unix:
224+
case PlatformIDMonoUnix:
224225
break;
225226

226227
// Don't handle the Xbox case. Let default handle it.
227228
// case PlatformID.Xbox:
228229
// break;
229-
default:
230-
if ((int)Environment.OSVersion.Platform == PlatformMonoUnixValue)
231-
{
232-
break;
233-
}
234230

231+
default:
235232
throw new WebDriverException("Unsupported platform: " + Environment.OSVersion.Platform);
236233
}
237234

‎dotnet/src/webdriver/Firefox/FirefoxDriverService.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ private static string FirefoxDriverServiceFileName()
263263
// straightforward as you might hope.
264264
// See: http://mono.wikia.com/wiki/Detecting_the_execution_platform
265265
// and https://msdn.microsoft.com/en-us/library/3a8hyw88(v=vs.110).aspx
266-
const int PlatformMonoUnixValue = 128;
266+
const PlatformID PlatformIDMonoUnix = (PlatformID)128;
267267

268268
switch (Environment.OSVersion.Platform)
269269
{
@@ -276,17 +276,13 @@ private static string FirefoxDriverServiceFileName()
276276

277277
case PlatformID.MacOSX:
278278
case PlatformID.Unix:
279+
case PlatformIDMonoUnix:
279280
break;
280281

281282
// Don't handle the Xbox case. Let default handle it.
282283
// case PlatformID.Xbox:
283284
// break;
284285
default:
285-
if ((int)Environment.OSVersion.Platform == PlatformMonoUnixValue)
286-
{
287-
break;
288-
}
289-
290286
throw new WebDriverException("Unsupported platform: " + Environment.OSVersion.Platform);
291287
}
292288

‎dotnet/src/webdriver/Internal/Base64UrlEncoder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ namespace OpenQA.Selenium.Internal
2525
{
2626
/*
2727
* Based on: https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/blob/6.19.0/src/Microsoft.IdentityModel.Tokens/Base64UrlEncoder.cs
28-
*
28+
*
2929
* Now it is a part of .NET 9+ as System.Buffers.Text.Base64Url
30-
* https://github.com/SeleniumHQ/selenium/issues/14813
30+
* https://github.com/SeleniumHQ/selenium/issues/14813
3131
*/
3232

3333
/// <summary>

‎dotnet/src/webdriver/Platform.cs‎

Lines changed: 34 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
using System;
2121

22+
#nullable enable
23+
2224
namespace OpenQA.Selenium
2325
{
2426
/// <summary>
@@ -84,138 +86,92 @@ public enum PlatformType
8486
/// </summary>
8587
public class Platform
8688
{
87-
private static Platform current;
88-
private PlatformType platformTypeValue;
89-
private int major;
90-
private int minor;
89+
private static Platform? current;
9190

9291
/// <summary>
9392
/// Initializes a new instance of the <see cref="Platform"/> class for a specific platform type.
9493
/// </summary>
9594
/// <param name="typeValue">The platform type.</param>
9695
public Platform(PlatformType typeValue)
9796
{
98-
this.platformTypeValue = typeValue;
97+
this.PlatformType = typeValue;
9998
}
10099

101100
private Platform()
102101
{
103-
this.major = Environment.OSVersion.Version.Major;
104-
this.minor = Environment.OSVersion.Version.Minor;
102+
this.MajorVersion = Environment.OSVersion.Version.Major;
103+
this.MinorVersion = Environment.OSVersion.Version.Minor;
105104

106105
switch (Environment.OSVersion.Platform)
107106
{
108107
case PlatformID.Win32NT:
109-
if (this.major == 5)
108+
if (this.MajorVersion == 5)
110109
{
111-
this.platformTypeValue = PlatformType.XP;
110+
this.PlatformType = PlatformType.XP;
112111
}
113-
else if (this.major == 6)
112+
else if (this.MajorVersion == 6)
114113
{
115-
this.platformTypeValue = PlatformType.Vista;
114+
this.PlatformType = PlatformType.Vista;
116115
}
117116
else
118117
{
119-
this.platformTypeValue = PlatformType.Windows;
118+
this.PlatformType = PlatformType.Windows;
120119
}
121120

122121
break;
123122

124123
// Thanks to a bug in Mono Mac and Linux will be treated the same https://bugzilla.novell.com/show_bug.cgi?id=515570 but adding this in case
125124
case PlatformID.MacOSX:
126-
this.platformTypeValue = PlatformType.Mac;
125+
this.PlatformType = PlatformType.Mac;
127126
break;
128127

129128
case PlatformID.Unix:
130-
this.platformTypeValue = PlatformType.Unix;
129+
this.PlatformType = PlatformType.Unix;
131130
break;
132131
}
133132
}
134133

135134
/// <summary>
136135
/// Gets the current platform.
137136
/// </summary>
138-
public static Platform CurrentPlatform
139-
{
140-
get
141-
{
142-
if (current == null)
143-
{
144-
current = new Platform();
145-
}
146-
147-
return current;
148-
}
149-
}
137+
public static Platform CurrentPlatform => current ??= new Platform();
150138

151139
/// <summary>
152140
/// Gets the major version of the platform operating system.
153141
/// </summary>
154-
public int MajorVersion
155-
{
156-
get { return this.major; }
157-
}
142+
public int MajorVersion { get; }
158143

159144
/// <summary>
160145
/// Gets the major version of the platform operating system.
161146
/// </summary>
162-
public int MinorVersion
163-
{
164-
get { return this.minor; }
165-
}
147+
public int MinorVersion { get; }
166148

167149
/// <summary>
168150
/// Gets the type of the platform.
169151
/// </summary>
170-
public PlatformType PlatformType
171-
{
172-
get { return this.platformTypeValue; }
173-
}
152+
public PlatformType PlatformType { get; }
174153

175154
/// <summary>
176155
/// Gets the value of the platform type for transmission using the JSON Wire Protocol.
177156
/// </summary>
178-
public string ProtocolPlatformType
179-
{
180-
get { return this.platformTypeValue.ToString("G").ToUpperInvariant(); }
181-
}
157+
public string ProtocolPlatformType => this.PlatformType.ToString("G").ToUpperInvariant();
182158

183159
/// <summary>
184160
/// Compares the platform to the specified type.
185161
/// </summary>
186-
/// <param name="compareTo">A <see cref="PlatformType"/> value to compare to.</param>
162+
/// <param name="compareTo">A <see cref="Selenium.PlatformType"/> value to compare to.</param>
187163
/// <returns><see langword="true"/> if the platforms match; otherwise <see langword="false"/>.</returns>
188164
public bool IsPlatformType(PlatformType compareTo)
189165
{
190-
bool platformIsType = false;
191-
switch (compareTo)
166+
return compareTo switch
192167
{
193-
case PlatformType.Any:
194-
platformIsType = true;
195-
break;
196-
197-
case PlatformType.Windows:
198-
platformIsType = this.platformTypeValue == PlatformType.Windows || this.platformTypeValue == PlatformType.XP || this.platformTypeValue == PlatformType.Vista;
199-
break;
200-
201-
case PlatformType.Vista:
202-
platformIsType = this.platformTypeValue == PlatformType.Windows || this.platformTypeValue == PlatformType.Vista;
203-
break;
204-
205-
case PlatformType.XP:
206-
platformIsType = this.platformTypeValue == PlatformType.Windows || this.platformTypeValue == PlatformType.XP;
207-
break;
208-
209-
case PlatformType.Linux:
210-
platformIsType = this.platformTypeValue == PlatformType.Linux || this.platformTypeValue == PlatformType.Unix;
211-
break;
212-
213-
default:
214-
platformIsType = this.platformTypeValue == compareTo;
215-
break;
216-
}
217-
218-
return platformIsType;
168+
PlatformType.Any => true,
169+
PlatformType.Windows => this.PlatformType is PlatformType.Windows or PlatformType.XP or PlatformType.Vista,
170+
PlatformType.Vista => this.PlatformType is PlatformType.Windows or PlatformType.Vista,
171+
PlatformType.XP => this.PlatformType is PlatformType.Windows or PlatformType.XP,
172+
PlatformType.Linux => this.PlatformType is PlatformType.Linux or PlatformType.Unix,
173+
_ => this.PlatformType == compareTo,
174+
};
219175
}
220176

221177
/// <summary>
@@ -224,7 +180,7 @@ public bool IsPlatformType(PlatformType compareTo)
224180
/// <returns>The string value for this platform type.</returns>
225181
public override string ToString()
226182
{
227-
return this.platformTypeValue.ToString();
183+
return this.PlatformType.ToString();
228184
}
229185

230186
/// <summary>
@@ -234,18 +190,15 @@ public override string ToString()
234190
/// <returns>The Platform object represented by the string name.</returns>
235191
internal static Platform FromString(string platformName)
236192
{
237-
PlatformType platformTypeFromString = PlatformType.Any;
238-
try
193+
if (Enum.TryParse(platformName, ignoreCase: true, out PlatformType platformTypeFromString))
239194
{
240-
platformTypeFromString = (PlatformType)Enum.Parse(typeof(PlatformType), platformName, true);
241-
}
242-
catch (ArgumentException)
243-
{
244-
// If the requested platform string is not a valid platform type,
245-
// ignore it and use PlatformType.Any.
195+
return new Platform(platformTypeFromString);
246196
}
247197

248-
return new Platform(platformTypeFromString);
198+
// If the requested platform string is not a valid platform type,
199+
// ignore it and use PlatformType.Any.
200+
201+
return new Platform(PlatformType.Any);
249202
}
250203
}
251204
}

‎dotnet/src/webdriver/VirtualAuth/VirtualAuthenticatorOptions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ public VirtualAuthenticatorOptions SetHasUserVerification(bool hasUserVerificati
148148

149149
/// <summary>
150150
/// If set to <see langword="true"/>, a <see href="https://w3c.github.io/webauthn/#user-consent">User Consent</see> will always be granted.
151-
/// Refer
152151
/// </summary>
153152
/// <param name="isUserConsenting">Whether a user consent will always be granted.</param>
154153
/// <returns>This options instance for chaining.</returns>

0 commit comments

Comments
 (0)