Bug 180127 – Adopt updated NSKeyed[Un]Archiver API when available

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Brent Fulgham]

Update WebKit/WebCore to use updated NSKeyed[Un]Archiver API when available.

[Brent Fulgham]

<rdar://problem/35710738>

[Brent Fulgham]

Note: This change adopts the new APIs where they match the behavior of existing WebKit code. No attempts are made in this patch to apply NSSecureCoding in places we were not previously.

There should be absolutely no change in behavior with this patch.

[Brent Fulgham]

Created attachment 327834 [details]
Patch

[Alex Christensen]

Comment on attachment 327834 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=327834&action=review

r=me with comments.  Don't break anything.

> Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h:34
> +#if USE(APPLE_INTERNAL_SDK) && USE(SECURE_BY_DEFAULT_ARCHIVER_API)
> +
> +#import <Foundation/NSKeyedArchiver_Private.h>
> +
> +#else

I think this would look nicer if it were arranged like this:

#if USE(SECURE_BY_DEFAULT_ARCHIVER_API)
#if USE(APPLE_INTERNAL_SDK)
#import <Foundation/NSKeyedArchiver_Private.h>
#else
...
#endif
#endif

I would also call SECURE_BY_DEFAULT_ARCHIVER_API SECURE_ARCHIVER_API

> Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h:62
> +#include <wtf/RetainPtr.h>

This looks strange in the middle of the file.  The things below this are also not SPI declarations.  Maybe they could go in a different header.

> Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h:77
> +inline NSData *_Nullable archivedDataWithRootObject(id _Nonnull object)

Would it make sense to call this insecurelyArchivedDataWithRootObject to mirror securelyArchivedDataWithRootObject and emphasize that it's insecure?

> Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm:49
>      @try {

Could we have this outside of the #if to have mirrored braces?

[Brent Fulgham]

Comment on attachment 327834 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=327834&action=review

>> Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h:34
>> +#else
> 
> I think this would look nicer if it were arranged like this:
> 
> #if USE(SECURE_BY_DEFAULT_ARCHIVER_API)
> #if USE(APPLE_INTERNAL_SDK)
> #import <Foundation/NSKeyedArchiver_Private.h>
> #else
> ...
> #endif
> #endif
> 
> I would also call SECURE_BY_DEFAULT_ARCHIVER_API SECURE_ARCHIVER_API

Ok!

>> Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h:62
>> +#include <wtf/RetainPtr.h>
> 
> This looks strange in the middle of the file.  The things below this are also not SPI declarations.  Maybe they could go in a different header.

I'll move the #include, but I don't think these utility functions need to be moved. They allow us to build on systems with or without access to this SPI without requiring tons of #if/defs all over our codebase.

>> Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h:77
>> +inline NSData *_Nullable archivedDataWithRootObject(id _Nonnull object)
> 
> Would it make sense to call this insecurelyArchivedDataWithRootObject to mirror securelyArchivedDataWithRootObject and emphasize that it's insecure?

Sure -- that's a good idea.

>> Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm:49
>>      @try {
> 
> Could we have this outside of the #if to have mirrored braces?

No -- there are differences in the implementations inside the #if/else.

[Brent Fulgham]

Created attachment 327839 [details]
Patch Part 1 (Landed)

[WebKit Commit Bot]

Comment on attachment 327839 [details]
Patch Part 1 (Landed)

Clearing flags on attachment: 327839

Committed r225264: <https://trac.webkit.org/changeset/225264>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Brent Fulgham]

Reopening for a second fix needed for another API call that changed.

[Brent Fulgham]

Created attachment 327907 [details]
Patch Part 2

[EWS Watchlist]

Attachment 327907 [details] did not pass style-queue:


ERROR: Source/WebKit/Shared/ios/InteractionInformationAtPosition.mm:86:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Total errors found: 1 in 11 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Brent Fulgham]

Created attachment 327909 [details]
Patch

[Brent Fulgham]

Created attachment 327913 [details]
Patch

[Brent Fulgham]

Created attachment 327914 [details]
Patch

[Brent Fulgham]

Simon discovered another deprecation error, so revising the patch.

[Brent Fulgham]

Created attachment 327919 [details]
Patch

[Brent Fulgham]

Created attachment 327921 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 327921 [details]
Patch

Clearing flags on attachment: 327921

Committed r225309: <https://trac.webkit.org/changeset/225309>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.