0002-libvlc_media-add-cookie_jar-API.patch 5.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168
  1. From 980fbe5397358cb97008a1bf4c57d0311284b6ec Mon Sep 17 00:00:00 2001
  2. From: Thomas Guillem <thomas@gllm.fr>
  3. Date: Fri, 16 Sep 2016 15:51:11 +0200
  4. Subject: [PATCH 02/17] libvlc_media: add cookie_jar API
  5. ---
  6. include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
  7. lib/libvlc.sym | 2 ++
  8. lib/media.c | 25 +++++++++++++++++++++++++
  9. lib/media_internal.h | 2 ++
  10. lib/media_player.c | 7 +++++++
  11. 5 files changed, 71 insertions(+)
  12. diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
  13. index 9f806a2e40..975a647305 100644
  14. --- a/include/vlc/libvlc_media.h
  15. +++ b/include/vlc/libvlc_media.h
  16. @@ -970,6 +970,41 @@ LIBVLC_API
  17. void libvlc_media_slaves_release( libvlc_media_slave_t **pp_slaves,
  18. unsigned int i_count );
  19. +/**
  20. + * Parse a value of an incoming Set-Cookie header (see RFC 6265) and append the
  21. + * cookie to the cookie jar if appropriate. The "secure" attribute can be added
  22. + * to psz_cookie to limit the scope of the cookie to secured channels (https).
  23. + *
  24. + * \note must be called before the first call of libvlc_media_player_play() to
  25. + * take effect. The cookie jar is only used for http/https accesses.
  26. + *
  27. + * \version LibVLC 3.0.0 and later.
  28. + *
  29. + * \param p_md media descriptor object
  30. + * \param psz_cookie header field value of Set-Cookie:
  31. + * "name=value<;attributes>" (must not be NULL)
  32. + * \param psz_host host to which the cookie will be sent (must not be NULL)
  33. + * \param psz_path scope of the cookie (must not be NULL)
  34. + *
  35. + * \return 0 on success, -1 on error.
  36. + */
  37. +LIBVLC_API int
  38. +libvlc_media_cookie_jar_store( libvlc_media_t *p_md, const char *psz_cookie,
  39. + const char *psz_host, const char *psz_path );
  40. +
  41. +/**
  42. + * Clear the cookie jar of a media.
  43. + *
  44. + * \note must be called before the first call of libvlc_media_player_play() to
  45. + * take effect.
  46. + *
  47. + * \version LibVLC 3.0.0 and later.
  48. + *
  49. + * \param p_md media descriptor object
  50. + */
  51. +LIBVLC_API void
  52. +libvlc_media_cookie_jar_clear( libvlc_media_t *p_md );
  53. +
  54. /** @}*/
  55. # ifdef __cplusplus
  56. diff --git a/lib/libvlc.sym b/lib/libvlc.sym
  57. index d8fb0806bc..e79a65a362 100644
  58. --- a/lib/libvlc.sym
  59. +++ b/lib/libvlc.sym
  60. @@ -189,6 +189,8 @@ libvlc_media_set_user_data
  61. libvlc_media_subitems
  62. libvlc_media_tracks_get
  63. libvlc_media_tracks_release
  64. +libvlc_media_cookie_jar_store
  65. +libvlc_media_cookie_jar_clear
  66. libvlc_new
  67. libvlc_playlist_play
  68. libvlc_release
  69. diff --git a/lib/media.c b/lib/media.c
  70. index f045c729d2..4bbd979986 100644
  71. --- a/lib/media.c
  72. +++ b/lib/media.c
  73. @@ -407,6 +407,7 @@ libvlc_media_t * libvlc_media_new_from_input_item(
  74. p_md->p_subitems = NULL;
  75. libvlc_event_manager_init( &p_md->event_manager, p_md );
  76. + p_md->p_cookie_jar = NULL;
  77. input_item_Hold( p_md->p_input_item );
  78. @@ -562,6 +563,9 @@ void libvlc_media_release( libvlc_media_t *p_md )
  79. input_item_Release( p_md->p_input_item );
  80. + if( p_md->p_cookie_jar )
  81. + vlc_http_cookies_destroy( p_md->p_cookie_jar );
  82. +
  83. vlc_cond_destroy( &p_md->parsed_cond );
  84. vlc_mutex_destroy( &p_md->parsed_lock );
  85. vlc_mutex_destroy( &p_md->subitems_lock );
  86. @@ -1347,3 +1351,24 @@ void libvlc_media_slaves_release( libvlc_media_slave_t **pp_slaves,
  87. }
  88. free( pp_slaves );
  89. }
  90. +
  91. +int
  92. +libvlc_media_cookie_jar_store( libvlc_media_t *p_md, const char *psz_cookie,
  93. + const char *psz_host, const char *psz_path )
  94. +{
  95. + if( !p_md->p_cookie_jar )
  96. + {
  97. + p_md->p_cookie_jar = vlc_http_cookies_new();
  98. + if( !p_md->p_cookie_jar )
  99. + return -1;
  100. + }
  101. + return vlc_http_cookies_store( p_md->p_cookie_jar, psz_cookie, psz_host,
  102. + psz_path ) ? 0 : -1;
  103. +}
  104. +
  105. +void
  106. +libvlc_media_cookie_jar_clear( libvlc_media_t *p_md )
  107. +{
  108. + if( p_md->p_cookie_jar )
  109. + vlc_http_cookies_clear( p_md->p_cookie_jar );
  110. +}
  111. diff --git a/lib/media_internal.h b/lib/media_internal.h
  112. index aefc731c68..e90248c91b 100644
  113. --- a/lib/media_internal.h
  114. +++ b/lib/media_internal.h
  115. @@ -29,6 +29,7 @@
  116. #include <vlc_common.h>
  117. #include <vlc_input.h>
  118. +#include <vlc_http.h>
  119. struct libvlc_media_t
  120. {
  121. @@ -47,6 +48,7 @@ struct libvlc_media_t
  122. libvlc_media_parsed_status_t parsed_status;
  123. bool is_parsed;
  124. bool has_asked_preparse;
  125. + vlc_http_cookie_jar_t *p_cookie_jar;
  126. };
  127. /* Media Descriptor */
  128. diff --git a/lib/media_player.c b/lib/media_player.c
  129. index cdb6ba0b8c..575632f2cd 100644
  130. --- a/lib/media_player.c
  131. +++ b/lib/media_player.c
  132. @@ -576,6 +576,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
  133. var_Create (mp, "rate", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT);
  134. var_Create (mp, "sout", VLC_VAR_STRING);
  135. var_Create (mp, "demux-filter", VLC_VAR_STRING);
  136. + var_Create (mp, "http-cookies", VLC_VAR_ADDRESS);
  137. /* Video */
  138. var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
  139. @@ -913,6 +914,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
  140. vlc_player_t *player = p_mi->player;
  141. vlc_player_Lock(player);
  142. + if( p_mi->p_md->p_cookie_jar )
  143. + {
  144. + vlc_value_t cookies = { .p_address = p_mi->p_md->p_cookie_jar };
  145. + var_SetChecked( p_mi, "http-cookies", VLC_VAR_ADDRESS, cookies );
  146. + }
  147. +
  148. int ret = vlc_player_Start(player);
  149. if (ret == VLC_SUCCESS)
  150. {
  151. --
  152. 2.21.1 (Apple Git-122.3)